From b92a4e1ca98d14ee7c0ba3672a4544ee31a9dbe5 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Mon, 22 Jan 2024 12:23:57 +0000 Subject: [PATCH] Revert^8 "Enable dex container (DEX v41) for the whole system" This reverts commit 43668c6f1353284426ffa5b8fa5f571f2139e5dc. Reason for revert: Reland Bug: 317744117 Bug: 329465418 Test: Device boots Change-Id: I4b0478030c6a4980f33087ec5764018295691bac --- java/dex.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/java/dex.go b/java/dex.go index 4474c636a..b721f5888 100644 --- a/java/dex.go +++ b/java/dex.go @@ -223,6 +223,16 @@ 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" { + // 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.