commit 87ccbfaa4638773f55854e8b2ca3d4c6b1ea57f7
author Svet Ganov <svetoslavganov@google.com> Wed Apr 15 15:10:14 2020 -0700
committer Svet Ganov <svetoslavganov@google.com> Sat May 02 14:26:57 2020 -0700
tree 68339efd7eeb5140ef5f52e7c9a699ecfcdf5955
parent a4faa6608f5a7008cbab201ee2af48590da106ec

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

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: 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) {