commit abda9446677065f5e8be68abbba127baf2f15286
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 20 00:00:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 20 00:00:54 2018 +0000
tree 94a51b8df0556b434eb7e5c76966aef8e5d9e9f1
parent a70669e4a5aa61cea894b923e7b88fca2aaba50d
parent 75266ab671a6a0460f02802878db57904a26ab07

Merge "Pass the intermediate dir to appcompat.sh"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 0f9d4dd..743d667 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2455,7 +2455,7 @@
 define run-appcompat
 $(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
+  PACKAGING=$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING art/tools/veridex/appcompat.sh --dex-file=$@ 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
 endef
 appcompat-files = \
   art/tools/veridex/appcompat.sh \