tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert^6 "Enable dex container (DEX v41) for the whole system"" into main am: f01e2f7308

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2878966

Change-Id: I6d28bdd97dd499d6cfd1a490bdd7a38dc0a92194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Srbecky 2023-12-20 02:00:12 +00:00 committed by Automerger Merge Worker
commit 209834dd38
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/dex.go
View file

@ -223,6 +223,13 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
if err != nil {
ctx.PropertyErrorf("min_sdk_version", "%s", err)
}
if effectiveVersion.FinalOrFutureInt() >= 35 {
// V is 35, but we have not bumped the SDK version yet, so check for both.
if ctx.Config().PlatformSdkVersion().FinalInt() >= 35 ||
ctx.Config().PlatformSdkCodename() == "VanillaIceCream" {
flags = append([]string{"-JDcom.android.tools.r8.dexContainerExperiment"}, flags...)
}
}
// If the specified SDK level is 10000, then configure the compiler to use the
// current platform SDK level and to compile the build as a platform build.