From c319fdb65a91248a18ddf4ebc41cce9ae366b1b6 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 10 Jul 2019 14:00:44 +0100 Subject: [PATCH] Remove direct dependency on art/tools/veridex/appcompat.sh The dependency causes a build breakage when unbundling the runtime module, i.e. when the art repository is not present in the local build tree. Bug: 134379140 Test: m droid Change-Id: Ia3f9b60dbe3e9cf00ea13ae7bdc74bdd386b4362 --- core/definitions.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 431231d844..1e237818ec 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2315,13 +2315,14 @@ $(hide) \ echo "Install path on $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT): $(PRIVATE_INSTALLED_MODULE)" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \ echo >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log endef +ART_VERIDEX_APPCOMPAT_SCRIPT:=$(HOST_OUT)/bin/appcompat.sh define run-appcompat $(hide) \ echo "appcompat.sh output:" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \ - PACKAGING=$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING ANDROID_LOG_TAGS="*:e" art/tools/veridex/appcompat.sh --dex-file=$@ --api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log + PACKAGING=$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING ANDROID_LOG_TAGS="*:e" $(ART_VERIDEX_APPCOMPAT_SCRIPT) --dex-file=$@ --api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log endef appcompat-files = \ - art/tools/veridex/appcompat.sh \ + $(ART_VERIDEX_APPCOMPAT_SCRIPT) \ $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) \ $(HOST_OUT_EXECUTABLES)/veridex \ $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/core_dex_intermediates/classes.dex \