commit 1912a57900025e8ed44063b7421b7d859540ab73
author Ian Pedowitz <ijpedowitz@google.com> Sun May 12 19:44:42 2019 +0000
committer Ian Pedowitz <ijpedowitz@google.com> Sun May 12 19:44:42 2019 +0000
tree c4417c57ccc5825b6425a93780e53c4d1f480980
parent 60c71cee6ec064a0d2f4c6608fdb54bf95545d45

Revert "Revert "Android Q is API 29""

This reverts commit 60c71cee6ec064a0d2f4c6608fdb54bf95545d45.

Reason for revert: Rolling forward for Q-Finalization

Bug: 131429032
Bug: 129975435
Change-Id: Idd812d93b767d8a672b9ada58c8bcc2441395847

tools/aapt/SdkConstants.h

diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index c1fcf5c..27ffcdf 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -44,6 +44,7 @@
     SDK_O = 26,
     SDK_O_MR1 = 27,
     SDK_P = 28,
+    SDK_Q = 29,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS

tools/aapt2/SdkConstants.h

diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 9fa29f2..580daab 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -54,6 +54,7 @@
   SDK_O = 26,
   SDK_O_MR1 = 27,
   SDK_P = 28,
+  SDK_Q = 29,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);