commit a95fbd1ed57c7261788a354d1ca18821d1df483c
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 19 13:10:31 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Oct 06 11:14:08 2017 +0100
tree ffedf0f4d8f27186bb8d75645ae088eb9fcbcc3f
parent 03e8fb10d132014e94294f53ee16bc8d5c629d6d

Add a product variable for priv-apps dependencies.

Those dependencies are jars/apks on which we want to
uncompress their dexs.

bug: 30972906
bug: 63920015

Test: sailfish build

Change-Id: Ic96ffe9dbe39abc1c28e7de134892d689207c9ca

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 3622c9c..2b7a920 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -344,6 +344,10 @@
 ifneq (true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))
 ifeq (true,$(LOCAL_PRIVILEGED_MODULE))
 	$(uncompress-dexs)
+else
+  ifneq (,$(filter $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES), $(LOCAL_MODULE)))
+	  $(uncompress-dexs)
+  endif  # PRODUCT_LOADED_BY_PRIVILEGED_MODULES
 endif  # LOCAL_PRIVILEGED_MODULE
 endif  # DONT_UNCOMPRESS_PRIV_APPS_DEXS
 ifdef LOCAL_DEX_PREOPT