From bea1d1a572535b64d46dfde6b5ee188709d3a099 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 25 Jun 2019 13:35:30 -0700 Subject: Uncompress dex in unbundled privileged apps Mainline builds privileged apps unbundled and then uses them as prebuilts, so they need to respect the privileged flag when deciding whether or not to uncompress the dex. Bug: 135772877 Test: TestUncompressDex Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c --- java/app.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/java/app.go b/java/app.go index 7e38f877..fdea4350 100644 --- a/java/app.go +++ b/java/app.go @@ -197,15 +197,16 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { return true } - if ctx.Config().UnbundledBuild() { - return false - } - - // Uncompress dex in APKs of privileged apps + // Uncompress dex in APKs of privileged apps (even for unbundled builds, they may + // be preinstalled as prebuilts). if ctx.Config().UncompressPrivAppDex() && Bool(a.appProperties.Privileged) { return true } + if ctx.Config().UnbundledBuild() { + return false + } + return shouldUncompressDex(ctx, &a.dexpreopter) } -- cgit v1.2.3