From 762fbfb746727c747b247032b6cfdca0ddcc5a13 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 29 Oct 2018 12:58:06 -0700 Subject: [PATCH] Don't strip soong APKs APKs that are preopted to system_other should not be stripped. For now, don't strip any APKs. Bug: 118592830 Test: m PrintSpooler; zipinfo $OUT/system/app/PrintSpooler.apk | grep classes.dex Change-Id: Ife8a5fe4ff90e5e00ec24f43e089d9b3aa552fc0 --- java/app.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/app.go b/java/app.go index d1b04c3cc..1e92b8ce6 100644 --- a/java/app.go +++ b/java/app.go @@ -154,7 +154,6 @@ func (a *AndroidApp) uncompressOrStripDex(ctx android.ModuleContext) (uncompress strip = ctx.Config().DefaultStripDex() // TODO(ccross): don't strip dex installed on partitions that may be updated separately (like vendor) // TODO(ccross): don't strip dex on modules with LOCAL_APK_LIBRARIES equivalent - // TODO(ccross): don't strip dex on modules that are preopted to system_other // Uncompress dex in APKs of privileged apps, and modules used by privileged apps. if ctx.Config().UncompressPrivAppDex() && @@ -174,6 +173,9 @@ func (a *AndroidApp) uncompressOrStripDex(ctx android.ModuleContext) (uncompress strip = false } + // TODO(ccross): strip dexpropted modules that are not propted to system_other + strip = false + return uncompress, strip }