Revert^11 "Enable dex container (DEX v41) for the whole system"
This reverts commit d4f7316224
.
Reason for revert: Likely culprit for b/353452237, b/353451623 - 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: I187b9787d0b3f39c1d67c0e5a16930bee2af951d
This commit is contained in:
10
java/dex.go
10
java/dex.go
@@ -245,16 +245,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 !Bool(d.dexProperties.No_dex_container) && 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
|
// 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.
|
||||||
|
Reference in New Issue
Block a user