commit b06c30b4803e01b96e60af5ef822d10ab101385a
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 19 11:51:45 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 19 13:09:27 2017 +0100
tree b186f638e212cd4b25b3998b16fe5fd5ff1be379
parent 4971146b2b27002461df4c043e6d6dc5e7f0215b

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

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 5a0ac37..24816e9 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -341,6 +341,11 @@
 $(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR)
 	$(transform-prebuilt-to-target)
 	$(uncompress-shared-libs)
+ifneq (true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))
+ifeq (true,$(LOCAL_PRIVILEGED_MODULE))
+	$(uncompress-dexs)
+endif  # LOCAL_PRIVILEGED_MODULE
+endif  # DONT_UNCOMPRESS_PRIV_APPS_DEXS
 ifdef LOCAL_DEX_PREOPT
 ifneq ($(BUILD_PLATFORM_ZIP),)
 	@# Keep a copy of apk with classes.dex unstripped