Merge "Fix the args used to dexpreopt system server jars in prebuilt apexes" into main

2024-01-26 21:55:59 +00:00
parent 5d6c1eee0d e21a8d4dc6
commit 5a48d4fe3d
9 changed files with 66 additions and 49 deletions
--- a/java/app.go
+++ b/java/app.go
@@ -431,7 +431,7 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool {
 		return false
 	}

-	return shouldUncompressDex(ctx, &a.dexpreopter)
+	return shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &a.dexpreopter)
 }

 func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {