diff options
| author | 2022-04-13 12:14:53 -0700 | |
|---|---|---|
| committer | 2022-04-14 14:15:12 -0700 | |
| commit | d27566da4cc7e0de8efe00140fe28db1536bef43 (patch) | |
| tree | 473551720f54bb81c473ede1f761c9afe3148f5f | |
| parent | 174aea8c3eb4748c79a3a659d80031b4bd15d61d (diff) | |
Add UpsideDownCake to aapt2 codenames and android.os.Build
Bug: 219519679
Test: m checkbuild
Change-Id: I2b668d1cd875657b27a1d52bda21f238d7020862
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 5 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b2c6385248ae..b4a982864d4e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -30982,6 +30982,7 @@ package android.os { field public static final int S = 31; // 0x1f field public static final int S_V2 = 32; // 0x20 field public static final int TIRAMISU = 33; // 0x21 + field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710 } 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 0b956f8bf9e0..dbd602f27c11 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1167,6 +1167,11 @@ public class Build { * Tiramisu. */ public static final int TIRAMISU = 33; + + /** + * Upside Down Cake. + */ + public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */ diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index 8ea43abff895..34e8edb0a47f 100644 --- a/tools/aapt2/SdkConstants.cpp +++ b/tools/aapt2/SdkConstants.cpp @@ -27,7 +27,7 @@ namespace aapt { static ApiVersion sDevelopmentSdkLevel = 10000; static const auto sDevelopmentSdkCodeNames = - std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"}); + std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"}); static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x021c, 1}, |