From 113654facaf1deee6c6042ffc6457ec5a5cc8d84 Mon Sep 17 00:00:00 2001 From: Yuncheol Heo Date: Mon, 18 Mar 2024 17:41:12 +0000 Subject: [PATCH] Revert^9 "Enable dex container (DEX v41) for the whole system" This reverts commit b92a4e1ca98d14ee7c0ba3672a4544ee31a9dbe5. Reason for revert: tracking the test failure b/329907267 Change-Id: Id3fa8471f073e0ec705fd0aba653b032ff82f9ad --- java/dex.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/java/dex.go b/java/dex.go index b721f5888..4474c636a 100644 --- a/java/dex.go +++ b/java/dex.go @@ -223,16 +223,6 @@ 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.