diff options
| author | 2024-11-27 08:33:45 +0000 | |
|---|---|---|
| committer | 2024-11-27 08:33:45 +0000 | |
| commit | 4b01a521a8daacab7f0403cfd84ab2df5640011f (patch) | |
| tree | 945b34943e46bf75dec4a41d45be78a1754e67fb /java/dex.go | |
| parent | 375b4d4b539d52ecb2ca693ae6b530837fbb6a42 (diff) | |
| parent | a31524688f8ee45e787873f3ec73b7e0d9a32357 (diff) | |
Merge "Enable dex container (DEX v41) for the main branch" into main am: a31524688f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3375722
Change-Id: I1b856205386f74c9057d9de36cdbd395135a9fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/dex.go b/java/dex.go index 983377ead..2b3c9319a 100644 --- a/java/dex.go +++ b/java/dex.go @@ -252,14 +252,11 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext, if err != nil { ctx.PropertyErrorf("min_sdk_version", "%s", err) } - if !Bool(d.dexProperties.No_dex_container) && effectiveVersion.FinalOrFutureInt() >= 36 { + if !Bool(d.dexProperties.No_dex_container) && effectiveVersion.FinalOrFutureInt() >= 36 && ctx.Config().UseDexV41() { // W is 36, but we have not bumped the SDK version yet, so check for both. if ctx.Config().PlatformSdkVersion().FinalInt() >= 36 || - ctx.Config().PlatformSdkCodename() == "Wear" { - // 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...) - } + ctx.Config().PlatformSdkCodename() == "Baklava" { + flags = append([]string{"-JDcom.android.tools.r8.dexContainerExperiment"}, flags...) } } |