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/Makefile

diff --git a/core/Makefile b/core/Makefile
index e94939b..8cc9907 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -40,7 +40,9 @@
         $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \
         $(if $(filter %.xml,$(_dest)),\
             $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\
-            $(eval $(call copy-one-file,$(_src),$(_fulldest)))) \
+            $(if $(and $(filter %.jar,$(_dest)),$(filter $(basename $(notdir $(_dest))),$(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))),\
+                $(eval $(call copy-and-uncompress-dexs,$(_src),$(_fulldest))), \
+                $(eval $(call copy-one-file,$(_src),$(_fulldest))))) \
         $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \
         $(eval unique_product_copy_files_destinations += $(_dest))))
 unique_product_copy_files_pairs :=