API 35 Preview - Vanilla Ice Cream (#3696)

* fix: support API 35 as Vanilla Ice Cream * feat: update internal framework to API 35 preview (Vanilla Ice Cream) * chore: SDK_CUR_DEVELOPMENT is 10,000
iBotPeaches · Sep 18, 2024 · c6bb75e · c6bb75e
1 parent 674bb42
commit c6bb75e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
@@ -194,6 +194,8 @@ private int mapSdkShorthandToVersion(String sdkVersion) {
                 return ResConfigFlags.SDK_UPSIDEDOWN_CAKE;
             case "VANILLAICECREAM":
             case "VANILLA_ICE_CREAM":
+                return ResConfigFlags.SDK_VANILLA_ICE_CREAM;
+            case "SDK_CUR_DEVELOPMENT":
                 return ResConfigFlags.SDK_DEVELOPMENT;
             default:
                 return Integer.parseInt(sdkVersion);

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -569,6 +569,7 @@ public int hashCode() {
     public final static byte SDK_S_V2 = 32;
     public final static byte SDK_TIRAMISU = 33;
     public final static byte SDK_UPSIDEDOWN_CAKE = 34;
+    public final static byte SDK_VANILLA_ICE_CREAM = 35;
 
     // AOSP has this as 10,000 for dev purposes.
     // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d

diff --git a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java
@@ -100,7 +100,7 @@ public void checkForSdkDevelopmentInsaneTestValue() {
         ApkInfo apkInfo = new ApkInfo();
 
         Map<String, String> sdkInfo = new LinkedHashMap<>();
-        sdkInfo.put("targetSdkVersion", "VANILLAICECREAM");
+        sdkInfo.put("targetSdkVersion", "SDK_CUR_DEVELOPMENT");
 
         apkInfo.setSdkInfo(sdkInfo);
         assertEquals("10000", apkInfo.checkTargetSdkVersionBounds());