summaryrefslogtreecommitdiff
path: root/tools/aapt2/SdkConstants.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-08-06 18:39:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-06 18:39:00 +0000
commitd23ca3d827e4a62fefc37159154ec01eccad52d2 (patch)
treed67fd6530fc6e0d1b8e5b4998866b4e6be339b97 /tools/aapt2/SdkConstants.cpp
parentd273ab14ac48f523803ce7284e8731d78abbb80e (diff)
parent831d3e804c7cfdc4b0a453871885aaca635fa249 (diff)
Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev-plus-aosp am: 831d3e804c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463862 Change-Id: If5a7e8df6f0a11e32ace33ae8473e4f417c78ddb
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
-rw-r--r--tools/aapt2/SdkConstants.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index ea886dbc2218..0bbde62728cf 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},