From 534f29822a264f75a4ce058a663229185998a3a8 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
---
 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 857b25e9b1cee..f57c4ee9d5b64 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,
     SDK_CUR_DEVELOPMENT = 10000,
 };
 
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 0bbde62728cf6..8ea43abff895a 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -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) {
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 384346be421bc..f2aaaf5ddcf0e 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,
   SDK_CUR_DEVELOPMENT = 10000,
 };