commit a525de7e6cfba5cd145d9bdf92f9ff199def76c9
author Dario Freni <dariofreni@google.com> Wed Sep 19 23:16:46 2018 +0100
committer Dario Freni <dariofreni@google.com> Wed Sep 19 23:18:23 2018 +0100
tree 8f3fe51733ebb844b9744070cb605434c0d6d9d7
parent d2ceeccc5c9dea12527057dd218f9cbca862e376

Accept an optional PACKAGING env parameter.

The parameter will indicate which directory contains intermediate
packages. For the ASAN builds, for example, this directory differs from
the default one.

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

tools/veridex/appcompat.sh

diff --git a/tools/veridex/appcompat.sh b/tools/veridex/appcompat.sh
index 9a24d82..a24e84f 100755
--- a/tools/veridex/appcompat.sh
+++ b/tools/veridex/appcompat.sh
@@ -55,7 +55,9 @@
   OUT=${OUT_DIR}
 fi
 
-PACKAGING=${OUT}/target/common/obj/PACKAGING
+if [[ -z "${PACKAGING}" ]]; then
+  PACKAGING=${OUT}/target/common/obj/PACKAGING
+fi
 
 if [ -z "$ANDROID_HOST_OUT" ] ; then
   ANDROID_HOST_OUT=${OUT}/host/linux-x86