diff options
Diffstat (limited to 'java/app.go')
-rw-r--r-- | java/app.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/app.go b/java/app.go index 8d41b570..ad672ead 100644 --- a/java/app.go +++ b/java/app.go @@ -188,17 +188,18 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { return true } - if ctx.Config().UnbundledBuild() { - return false - } - - // Uncompress dex in APKs of privileged apps, and modules used by privileged apps. + // Uncompress dex in APKs of privileged apps, and modules used by privileged apps + // (even for unbundled builds, they may be preinstalled as prebuilts). if ctx.Config().UncompressPrivAppDex() && (Bool(a.appProperties.Privileged) || inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules())) { return true } + if ctx.Config().UnbundledBuild() { + return false + } + // Uncompress if the dex files is preopted on /system. if !a.dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !odexOnSystemOther(ctx, a.dexpreopter.installPath)) { return true |