frameworks/base - Tiramisu is now 33 #2 am: f453228161

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699092

Change-Id: Ib36e4486605e944c660f04ba0cd73efff26e9b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/api/current.txt

@@ -30977,7 +30977,7 @@ package android.os {
     field public static final int R = 30; // 0x1e
     field public static final int S = 31; // 0x1f
     field public static final int S_V2 = 32; // 0x20
-    field public static final int TIRAMISU = 10000; // 0x2710
+    field public static final int TIRAMISU = 33; // 0x21
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -1166,7 +1166,7 @@ public class Build {
         /**
          * Tiramisu.
          */
-        public static final int TIRAMISU = CUR_DEVELOPMENT;
+        public static final int TIRAMISU = 33;
     }
 
     /** The type of build, like "user" or "eng". */

tools/aapt/SdkConstants.h

@@ -48,6 +48,7 @@ enum {
     SDK_R = 30,
     SDK_S = 31,
     SDK_S_V2 = 32,
+    SDK_TIRAMISU = 33,
     SDK_CUR_DEVELOPMENT = 10000,
 };
 

tools/aapt2/SdkConstants.h

@@ -58,6 +58,7 @@ enum : ApiVersion {
   SDK_R = 30,
   SDK_S = 31,
   SDK_S_V2 = 32,
+  SDK_TIRAMISU = 33,
   SDK_CUR_DEVELOPMENT = 10000,
 };