frameworks/base - Tiramisu is now 33 #2
Set current API level
Test: Build and boot
Bug: 225745567
Change-Id: If135d9795e812cc286c720b9351eaf6be621fd5b
diff --git a/core/api/current.txt b/core/api/current.txt
index 2a6536e..410bbb2 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -30977,7 +30977,7 @@
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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 42e6ac4..0b956f8 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1166,7 +1166,7 @@
/**
* Tiramisu.
*/
- public static final int TIRAMISU = CUR_DEVELOPMENT;
+ public static final int TIRAMISU = 33;
}
/** The type of build, like "user" or "eng". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index f57c4ee..a146466 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -48,6 +48,7 @@
SDK_R = 30,
SDK_S = 31,
SDK_S_V2 = 32,
+ SDK_TIRAMISU = 33,
SDK_CUR_DEVELOPMENT = 10000,
};
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index f2aaaf5..0bd61c0 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -58,6 +58,7 @@
SDK_R = 30,
SDK_S = 31,
SDK_S_V2 = 32,
+ SDK_TIRAMISU = 33,
SDK_CUR_DEVELOPMENT = 10000,
};