commit c55b42358dc330f4904005060c5f9e74ce04db75
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 18 09:16:14 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 18 09:16:14 2018 +0000
tree aafbcfab3a92d4838cb5af7e5786ef6332241213
parent 75e1c77f1b549feff300338913d3078924e1c0b9
parent b73ccb7a25a175396fe451db1ecb33793ad877d9

Merge "Fix installclean incremental builds w/veridex"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 7540b6e..82447c9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2465,10 +2465,21 @@
   echo "appcompat.sh output:" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \
   art/tools/veridex/appcompat.sh --dex-file=$@ 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
 endef
+appcompat-files = \
+  art/tools/veridex/appcompat.sh \
+  $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \
+  $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
+  $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
+  $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \
+  $(HOST_OUT_EXECUTABLES)/veridex \
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/core_dex_intermediates/classes.dex \
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/oahl_dex_intermediates/classes.dex
 else
 appcompat-header =
 run-appcompat =
+appcompat-files =
 endif  # HOST_OS == linux
+.KATI_READONLY: appcompat-header run-appcompat appcompat-files
 
 # Remove dynamic timestamps from packages
 #

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 2b8e762..42539f6 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -603,7 +603,7 @@
 endif
 
 ifeq ($(module_run_appcompat),true)
-$(LOCAL_BUILT_MODULE) : $(call intermediates-dir-for,PACKAGING,veridex,HOST)/veridex.zip
+$(LOCAL_BUILT_MODULE) : $(appcompat-files)
 $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
 endif
 

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 256c598..4d1aebc 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -368,7 +368,7 @@
 endif
 
 ifeq ($(module_run_appcompat),true)
-$(built_module) : $(call intermediates-dir-for,PACKAGING,veridex,HOST)/veridex.zip
+$(built_module) : $(appcompat-files)
 $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
 endif