Skip to content

feat: support for Android Baklava Developer Preview 1 #3728

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.

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

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ApkInfo implements YamlSerializable {
"AndroidManifest\\.xml|META-INF/[^/]+\\.(RSA|SF|MF)|stamp-cert-sha256");

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());

// only set when loaded from a file (not a stream)
Expand Down Expand Up @@ -180,6 +180,8 @@ private int mapSdkShorthandToVersion(String sdkVersion) {
case "VANILLAICECREAM":
case "VANILLA_ICE_CREAM":
return ResConfigFlags.SDK_VANILLA_ICE_CREAM;
case "BAKLAVA":
return ResConfigFlags.SDK_BAKLAVA;
case "SDK_CUR_DEVELOPMENT":
return ResConfigFlags.SDK_DEVELOPMENT;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,10 @@ public int hashCode() {
public final static byte SDK_UPSIDEDOWN_CAKE = 34;
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.
// platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d
public final static int SDK_DEVELOPMENT = 10000;
Expand Down
Binary file not shown.