Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55b4235 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix installclean incremental builds w/veridex"

parents 75e1c77f b73ccb7a

core/definitions.mk

+11 −0
Original line number Diff line number Diff line
@@ -2465,10 +2465,21 @@ $(hide) \ 
  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

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ endif 
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

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ $(built_module) : $(MINIGZIP) 
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