diff options
| author | 2022-03-08 06:55:02 +0000 | |
|---|---|---|
| committer | 2022-03-08 06:55:02 +0000 | |
| commit | 0f839e536d5b132dbade28db1d22841bb2612cd3 (patch) | |
| tree | 62f427a651cfef31d0e599098a6e67e11bbed8c1 /tools/aapt2/SdkConstants.cpp | |
| parent | 0c41c9bbbeafdf7b7dc7835a585bbfc4c60c0600 (diff) | |
| parent | 7e916e36c7e8a67079a098d4a6de996e74975ef6 (diff) | |
Merge "Merge Android 12L"
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 bfb7ce48c4aa..7ea4ab13961d 100644 --- a/tools/aapt2/SdkConstants.cpp +++ b/tools/aapt2/SdkConstants.cpp @@ -27,7 +27,7 @@ namespace aapt { static ApiVersion sDevelopmentSdkLevel = 10000; static const auto sDevelopmentSdkCodeNames = - std::unordered_set<StringPiece>({"Q", "R", "S", "Tiramisu"}); + std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"}); static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x021c, 1}, @@ -59,6 +59,7 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x0606, SDK_Q}, {0x0616, SDK_R}, {0x064b, SDK_S}, + {0x064c, SDK_S_V2}, }; static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) { |