From 083a2aa52df1c04b20103f3f6cf55631293e4500 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 6 Feb 2019 16:37:12 -0800
Subject: [PATCH] Make privileged java_library modules use uncompressed dex

Check java_library modules against ModulesLoadedByPrivilegedModules
to determine whether to uncompress the dex files in them.

Test: m checkbuild
Change-Id: I77ee456d55bec65c8b4c82e9bd38f344212e6140
---
 java/java.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/java.go b/java/java.go
index 22829e407..3d7d6ad8d 100644
--- 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
 }