Revert^10 "Enable dex container (DEX v41) for the whole system"
This reverts commit 113654facaf1deee6c6042ffc6457ec5a5cc8d84.
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
diff --git a/java/dex.go b/java/dex.go
index 7bb6925..d2a9331 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -245,6 +245,16 @@
if err != nil {
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
// current platform SDK level and to compile the build as a platform build.