From a33691288e3ff4e17d746bacbaf9196628aa3ef1 Mon Sep 17 00:00:00 2001 From: Chris Antol Date: Fri, 15 Dec 2023 18:10:35 +0000 Subject: [PATCH] Revert^5 "Enable dex container (DEX v41) for the whole system" This reverts commit d45836eb38123b2d8b00a683e251d8ef21b9be15. Reason for revert: Still breaks tests Bug: 314212435 Change-Id: I35867878c9a8b2aa3d64092a5326c42191569adc --- java/dex.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/java/dex.go b/java/dex.go index 91c245281..6f1c09d57 100644 --- a/java/dex.go +++ b/java/dex.go @@ -223,13 +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" { - 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.