Revert "Revert "Make privileged apps always keep uncompressed dex files.""
bug: 30972906
bug: 63920015
Test: doing zipinfo on the produced apks after build.
Test: fugu build
This reverts commit f69441b76b3a7e44802e0f574debd1286da4fd85.
Change-Id: I6b029f2044385f3e3fa332091a9244cec79d2474
diff --git a/core/definitions.mk b/core/definitions.mk
index ffeb663..a22e989 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2717,6 +2717,18 @@
$(hide) $(ZIPTIME) $@
endef
+# Uncompress dex files embedded in an apk.
+#
+define uncompress-dexs
+$(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
+ rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \
+ unzip $@ '*.dex' -d $(dir $@)uncompresseddexs && \
+ zip -d $@ '*.dex' && \
+ ( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \
+ rm -rf $(dir $@)uncompresseddexs; \
+ fi
+endef
+
# Uncompress shared libraries embedded in an apk.
#
define uncompress-shared-libs