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

This reverts commit 43668c6f13.

Reason for revert: Reland

Bug: 317744117
Bug: 329465418
Test: Device boots
Change-Id: I4b0478030c6a4980f33087ec5764018295691bac
This commit is contained in:
David Srbecky
2024-01-22 12:23:57 +00:00
parent 08bef285d8
commit b92a4e1ca9

View File

@@ -223,6 +223,16 @@ 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.