commit 75266ab671a6a0460f02802878db57904a26ab07
author Dario Freni <dariofreni@google.com> Wed Sep 19 23:13:46 2018 +0100
committer Dario Freni <dariofreni@google.com> Wed Sep 19 23:18:38 2018 +0100
tree ca3bf5956a41c19ffd0527caee3f5fd0563ac0c9
parent c4af7d75dc9d76d3d784975d917415d859c3e7a2

Pass the intermediate dir to appcompat.sh

For ASAN build the intermediate dir might differ from the default
directory.

Test: m (on an affected ASAN build)
Bug: 116020783
Change-Id: Ie4f282ea651d710351799f3fc24dba42e79ee63d

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 4df4bc6..f99c47b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2460,7 +2460,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 \