Revert^6 "Enable dex container (DEX v41) for the whole system"
This reverts commit a33691288e
.
Reason for revert: b/316609623
Change-Id: I7438f3e55a29cf07da907d04a97b1f7bcc85956c
This commit is contained in:
committed by
Gerrit Code Review
parent
a33691288e
commit
7022550d0e
@@ -223,6 +223,13 @@ 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" {
|
||||
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.
|
||||
|
Reference in New Issue
Block a user