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/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 57ac23c..e7da560 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -660,6 +660,15 @@
 endif
 
 ###########################################################
+# Ensure privileged applications always have LOCAL_PRIVILEGED_MODULE
+###########################################################
+ifndef LOCAL_PRIVILEGED_MODULE
+  ifneq (,$(filter $(TARGET_OUT_APPS_PRIVILEGED)/% $(TARGET_OUT_VENDOR_APPS_PRIVILEGED)/%,$(my_module_path)))
+    LOCAL_PRIVILEGED_MODULE := true
+  endif
+endif
+
+###########################################################
 ## NOTICE files
 ###########################################################