Merge "Make privileged java_library modules use uncompressed dex" am: 89ba9715ef

am: 8367be9da7 Change-Id: I18d0185aa672683f78591b603f5d74e805a50237
2019-02-07 18:48:06 -08:00 · 2019-02-07 18:48:06 -08:00 · 309ce85acd
parent d6fa3b1cbf 8367be9da7
commit 309ce85acd
1 changed files with 5 additions and 0 deletions
--- a/java/java.go
+++ b/java/java.go
@ -1423,6 +1423,11 @@ func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
 		android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
 		return true
 	}
+	if ctx.Config().UncompressPrivAppDex() &&
+		inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules()) {
+		return true
+	}
+
 	return false
 }