commit 534f29822a264f75a4ce058a663229185998a3a8
author Michael Wright <michaelwr@google.com> Thu Oct 28 17:05:25 2021 +0100
committer Michael Wright <michaelwr@google.com> Tue Nov 02 11:58:24 2021 +0000
tree 28ebccae7c5d5f45e7afb3c45398f188d543ecdb
parent 7d16f0b5312282c6635de88a598d4bdaf5e66b76

Update AAPT for S V2.

Bug: 204295952
Test: N/A
Change-Id: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a

tools/aapt/SdkConstants.h

diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index 857b25e..f57c4ee 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -47,6 +47,7 @@
     SDK_Q = 29,
     SDK_R = 30,
     SDK_S = 31,
+    SDK_S_V2 = 32,
     SDK_CUR_DEVELOPMENT = 10000,
 };
 

tools/aapt2/SdkConstants.cpp

diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 0bbde62..8ea43abf 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -59,6 +59,7 @@
     {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) {

tools/aapt2/SdkConstants.h

diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 384346b..f2aaaf5 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -57,6 +57,7 @@
   SDK_Q = 29,
   SDK_R = 30,
   SDK_S = 31,
+  SDK_S_V2 = 32,
   SDK_CUR_DEVELOPMENT = 10000,
 };