Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API 35 Preview - Vanilla Ice Cream #3696

Merged
merged 3 commits into from
Sep 18, 2024
Merged

API 35 Preview - Vanilla Ice Cream #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79d8c15
fix: support API 35 as Vanilla Ice Cream
iBotPeaches Sep 17, 2024
08ccfa4
feat: update internal framework to API 35 preview (Vanilla Ice Cream)
iBotPeaches Sep 17, 2024
a36beb3
chore: SDK_CUR_DEVELOPMENT is 10,000
iBotPeaches Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down