Magic-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/iBotPeaches/Apktool.git synced 2024-11-23 04:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support for Android Baklava Developer Preview 1 (#3728)

Browse Source
This commit is contained in:
Connor Tumbleson 2024-11-20 05:59:06 -05:00 committed by GitHub
parent 1eb1daf12a
commit f85f9b3b60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
View File

@ -35,7 +35,7 @@ public class ApkInfo implements YamlSerializable {
"AndroidManifest\\.xml|META-INF/[^/]+\\.(RSA|SF|MF)|stamp-cert-sha256"); "AndroidManifest\\.xml|META-INF/[^/]+\\.(RSA|SF|MF)|stamp-cert-sha256");
public final static Pattern STANDARD_FILENAMES_PATTERN = Pattern.compile( public final static Pattern STANDARD_FILENAMES_PATTERN = Pattern.compile(
"[^/]+\\.dex|resources\\.arsc|(" + String.join("|", RESOURCES_DIRNAMES) + "|" + "[^/]+\\.dex|resources\\.arsc|(" + String.join("|", RESOURCES_DIRNAMES) + "|" +
String.join("|", RAW_DIRNAMES) + ")/.*|" + ORIGINAL_FILENAMES_PATTERN.pattern()); String.join("|", RAW_DIRNAMES) + ")/.*|" + ORIGINAL_FILENAMES_PATTERN.pattern());
// only set when loaded from a file (not a stream) // only set when loaded from a file (not a stream)
@ -180,6 +180,8 @@ public class ApkInfo implements YamlSerializable {
case "VANILLAICECREAM": case "VANILLAICECREAM":
case "VANILLA_ICE_CREAM": case "VANILLA_ICE_CREAM":
return ResConfigFlags.SDK_VANILLA_ICE_CREAM; return ResConfigFlags.SDK_VANILLA_ICE_CREAM;
case "BAKLAVA":
return ResConfigFlags.SDK_BAKLAVA;
case "SDK_CUR_DEVELOPMENT": case "SDK_CUR_DEVELOPMENT":
return ResConfigFlags.SDK_DEVELOPMENT; return ResConfigFlags.SDK_DEVELOPMENT;
default: default:

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

@ -571,6 +571,10 @@ public class ResConfigFlags {
public final static byte SDK_UPSIDEDOWN_CAKE = 34; public final static byte SDK_UPSIDEDOWN_CAKE = 34;
public final static byte SDK_VANILLA_ICE_CREAM = 35; public final static byte SDK_VANILLA_ICE_CREAM = 35;
// AOSP changed Build IDs during QPR2 of API 34 (Upsidedown Cake), restarting at A.
// However, API 35 (Vanilla) took letter A (AP2A), so we start at B.
public final static byte SDK_BAKLAVA = 36;
// 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
public final static int SDK_DEVELOPMENT = 10000; public final static int SDK_DEVELOPMENT = 10000;

BIN
brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
View File

Binary file not shown.