From 87ccbfaa4638773f55854e8b2ca3d4c6b1ea57f7 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Wed, 15 Apr 2020 15:10:14 -0700
Subject: 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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools/aapt2/SdkConstants.cpp')

diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 304bc4925831..e8873bf2d81b 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -57,6 +57,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
     {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) {
-- 
cgit v1.2.3-59-g8ed1b