StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main am: 84fedd36a4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005894

Change-Id: Ic8c78a634bbfd8a9f9e44c0afe3fe5a743de7723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-19 01:34:58 +00:00
committed by Automerger Merge Worker
parent c229db6be3 84fedd36a4
commit 16ebf41398
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/dex.go
View File

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