ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-21 01:07:34 +01:00
Code Issues Projects Releases Wiki Activity

feat: support upside-down-cake/vanilla-ice-cream sdk shorthand (#3113)

Browse Source
This commit is contained in:
Connor Tumbleson 2023-07-02 05:35:45 -04:00 committed by GitHub
parent 5cd94d6aa0
commit 70d941d18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
View File

@ -699,6 +699,11 @@ final public class AndrolibResources {
return ResConfigFlags.SDK_S_V2; return ResConfigFlags.SDK_S_V2;
case "T": case "T":
case "TIRAMISU": case "TIRAMISU":
return ResConfigFlags.SDK_TIRAMISU;
case "UPSIDEDOWNCAKE":
case "UPSIDE_DOWN_CAKE":
case "VANILLAICECREAM":
case "VANILLA_ICE_CREAM":
return ResConfigFlags.SDK_DEVELOPMENT; return ResConfigFlags.SDK_DEVELOPMENT;
default: default:
return Integer.parseInt(sdkVersion); return Integer.parseInt(sdkVersion);

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
View File

@ -538,7 +538,7 @@ public class ResConfigFlags {
public final static byte SDK_R = 30; public final static byte SDK_R = 30;
public final static byte SDK_S = 31; public final static byte SDK_S = 31;
public final static byte SDK_S_V2 = 32; public final static byte SDK_S_V2 = 32;
public final static byte SDK_T = 33; public final static byte SDK_TIRAMISU = 33;
// AOSP has this as 10,000 for dev purposes. // AOSP has this as 10,000 for dev purposes.
// platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/androlib/InvalidSdkBoundingTest.java
View File

@ -101,7 +101,7 @@ public class InvalidSdkBoundingTest extends BaseTest {
AndrolibResources androlibResources = new AndrolibResources(); AndrolibResources androlibResources = new AndrolibResources();
Map<String, String> sdkInfo = new LinkedHashMap<>(); Map<String, String> sdkInfo = new LinkedHashMap<>();
sdkInfo.put("targetSdkVersion", "T"); sdkInfo.put("targetSdkVersion", "VANILLAICECREAM");
androlibResources.setSdkInfo(sdkInfo); androlibResources.setSdkInfo(sdkInfo);
assertEquals("10000", androlibResources.checkTargetSdkVersionBounds()); assertEquals("10000", androlibResources.checkTargetSdkVersionBounds());