From 0968a93679dbaa19d6cb425cba537ac883baee21 Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Fri, 1 Dec 2023 13:33:11 +0000 Subject: [PATCH] Revert^3 "Enable dex container (DEX v41) for the whole system" This reverts commit e4d0e949ce03e97adfe63c3c16c42c1855316100. Reason for revert: test monitor b/314212435 Change-Id: I53cd60d82f432d4eff132b5ee28227ece1ded7af --- 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.