Revert "Enable dex container (DEX v41) for the whole system"
This reverts commit b82a2a278badc282d43280ba13f544ddecc2d631.
Reason for revert: DroidMonitor: Potential culprit for multiple Module failures on ATH. verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.
Change-Id: I3899a45cce259c4ee38572e76f4735eccb3ca66a
diff --git a/java/dex.go b/java/dex.go
index 8af06d5..dab0836 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -221,11 +221,6 @@
if err != nil {
ctx.PropertyErrorf("min_sdk_version", "%s", err)
}
- // 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.
