From 75266ab671a6a0460f02802878db57904a26ab07 Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Wed, 19 Sep 2018 23:13:46 +0100
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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