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

This reverts commit b92a4e1ca9.

Reason for revert: tracking the test failure b/329907267

Change-Id: Id3fa8471f073e0ec705fd0aba653b032ff82f9ad
This commit is contained in:
Yuncheol Heo 2024-03-18 17:41:12 +00:00 committed by Gerrit Code Review
parent b92a4e1ca9
commit 113654faca

View file

@ -223,16 +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" {
// TODO(b/329465418): Skip this module since it causes issue with app DRM
if ctx.ModuleName() != "framework-minus-apex" {
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.