From 6aa3b2c86dcc8dc72b03c69e2ff3133baae4f10b Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Thu, 28 Oct 2021 17:05:25 +0100
Subject: [PATCH] Update AAPT for S V2.

Bug: 204295952
Test: N/A
Change-Id: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a
Merged-In: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a
---
 tools/aapt/SdkConstants.h    | 1 +
 tools/aapt2/SdkConstants.cpp | 1 +
 tools/aapt2/SdkConstants.h   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index 955581cf8655f..daf91b0326385 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -47,6 +47,7 @@ enum {
     SDK_Q = 29,
     SDK_R = 30,
     SDK_S = 31,
+    SDK_S_V2 = 32,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index cbcbf05c860cf..f8e448f0f676c 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -60,6 +60,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) {
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 6bb6ddb13bdb7..0f27ac50b3bfa 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -57,6 +57,7 @@ enum : ApiVersion {
   SDK_Q = 29,
   SDK_R = 30,
   SDK_S = 31,
+  SDK_S_V2 = 32,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);