Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main
This commit is contained in:
commit
3d11d51733
1 changed files with 0 additions and 7 deletions
|
@ -223,13 +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" {
|
||||
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.
|
||||
|
|
Loading…
Reference in a new issue