Merge "Support codename T in aapt2" am: ff7bba27a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715428

Change-Id: I5468ae8e3316cd2bd3517b9d83699db8352e7969
This commit is contained in:
Colin Cross
2021-06-03 08:45:02 +00:00
committed by Automerger Merge Worker

View File

@@ -27,7 +27,7 @@ namespace aapt {
static ApiVersion sDevelopmentSdkLevel = 10000; static ApiVersion sDevelopmentSdkLevel = 10000;
static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({ static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>({
"Q", "R", "S" "Q", "R", "S", "T"
}); });
static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {