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

This reverts commit e4d0e949ce.

Reason for revert: test monitor b/314212435 

Change-Id: I53cd60d82f432d4eff132b5ee28227ece1ded7af
This commit is contained in:
Serdar Kocdemir
2023-12-01 13:33:11 +00:00
committed by Gerrit Code Review
parent e4d0e949ce
commit 0968a93679

View File

@@ -223,13 +223,6 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
if err != nil { if err != nil {
ctx.PropertyErrorf("min_sdk_version", "%s", err) 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 // 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. // current platform SDK level and to compile the build as a platform build.