Merge "Disable dexpreopt if optional_uses_libs does not have an impl" into main

2024-02-20 08:08:35 +00:00
parent 73f4a4a481 0727ba76b1
commit 4bec95e2f6
6 changed files with 60 additions and 0 deletions
--- 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)