diff options
| author | Spandan Das <spandandas@google.com> | 2024-02-20 09:22:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-20 09:22:36 +0000 |
| commit | 542093ed4a7bc88131e8489b02b6c76fcba5ab9f (patch) | |
| tree | 875563b333a52ae59a8d846625c309888290ea5a /java/java.go | |
| parent | 304362044717a483a5729d93bc729903af93062e (diff) | |
| parent | 8a1033139c044f32c6eecfa7f80804686e2e61f7 (diff) | |
Merge "Disable dexpreopt if optional_uses_libs does not have an impl" into main am: 4bec95e2f6 am: 8a1033139c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2963583
Change-Id: Idd3198fc02b39ea6a8efa5f70437d3be4ad6e99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 1a266b859..7cf5c1f17 100644 --- a/java/java.go +++ b/java/java.go @@ -743,6 +743,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { setUncompressDex(ctx, &j.dexpreopter, &j.dexer) j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + if j.usesLibrary.shouldDisableDexpreopt { + j.dexpreopter.disableDexpreopt() + } } j.compile(ctx, nil, nil, nil) |