Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main

1 files changed, 0 insertions, 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.