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

Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007 am: ff5cf349f5

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

Change-Id: I09dde37478c63ac44bd22d5a928a31ea9dd34913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ramya Subramanian 2023-11-29 20:21:59 +00:00 committed by Automerger Merge Worker
commit cd13382e8e
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/dex.go
View file

@ -223,11 +223,6 @@ 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)
} }
// 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.