diff options
| author | 2021-06-02 20:11:14 +0000 | |
|---|---|---|
| committer | 2021-06-02 20:11:14 +0000 | |
| commit | e6fb6087aa433228cf0fb1a0d52d1a8721df38e3 (patch) | |
| tree | a5963c2b4371a5fb3f1dbbc87730c7a5e4c92d46 /tools/aapt2/SdkConstants.cpp | |
| parent | bc77821e7d522531b7dfd6c10b1df99c94742d9c (diff) | |
| parent | de062e478c37e98ac61540c9e68af717d95ca9cf (diff) | |
Merge changes from topic "may27-sdk" into sc-dev
* changes:
Finalize resource IDs; script to help in future.
platform/frameworks/base/ - S is now 31
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index e8873bf2d81b..96f6512fe7f5 100644 --- a/tools/aapt2/SdkConstants.cpp +++ b/tools/aapt2/SdkConstants.cpp @@ -58,7 +58,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x056d, SDK_O_MR1}, {0x0586, SDK_P}, {0x0606, SDK_Q}, - {0x0617, SDK_R}, + {0x0616, SDK_R}, + {0x064b, SDK_S}, }; static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) { |