StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie3be38bb2adc78992e343896a8acdecf2c591ec3
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:28:42 +00:00
committed by Automerger Merge Worker
parent 5d75893692 209834dd38
commit 1c35415ae1
1 changed files with 7 additions and 0 deletions
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 { if err != nil {
ctx.PropertyErrorf("min_sdk_version", "%s", err) 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 // 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. // current platform SDK level and to compile the build as a platform build.