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

Revert^10 "Enable dex container (DEX v41) for the whole system"

Browse Source 
This reverts commit 113654faca.

Reason for revert: Fixed CarLauncherTests error by providing an
    Android.bp property to disable multi-dex for a given app.

Bug: 341652226
Bug: 329907267

Test: atest CarLauncherTests -- --abi x86_64

Change-Id: Ie374161b38f0c260108b2b079ada6bdf4657aa86
This commit is contained in:
Ulya Trofimovich
2024-07-09 19:30:03 +00:00
committed by Ulya Trafimovich
parent c8160584f3
commit d4f7316224
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/dex.go
View File

@@ -245,6 +245,16 @@ 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 !Bool(d.dexProperties.No_dex_container) && 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" {
// TODO(b/329465418): Skip this module since it causes issue with app DRM
if ctx.ModuleName() != "framework-minus-apex" {
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.