commit ed460aa1868e969880dd88a1ecef483de21ea34e
author Svet Ganov <svetoslavganov@google.com> Wed Apr 15 15:10:14 2020 -0700
committer Svet Ganov <svetoslavganov@google.com> Fri May 01 15:25:27 2020 -0700
tree f1732201e8984690a44784ff50b39ca1b31b3c94
parent 1087cabfc75b6b2fb2602eff0bc1836e2903274a

Updating platform SDK version for R

  * Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d

tools/aapt2/SdkConstants.cpp

diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 304bc49..e8873bf 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -57,6 +57,8 @@
     {0x0568, SDK_O},
     {0x056d, SDK_O_MR1},
     {0x0586, SDK_P},
+    {0x0606, SDK_Q},
+    {0x0617, SDK_R},
 };
 
 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 a00d978..aa9aa12 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -55,6 +55,7 @@
   SDK_O_MR1 = 27,
   SDK_P = 28,
   SDK_Q = 29,
+  SDK_R = 30,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);