commit df9094ec5593a1540bade16afd1fa9426cbe9cf9
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 05 12:35:41 2019 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Apr 05 15:04:52 2019 +0000
tree 0e73607ef6f0cf29e16681b1e4e03c1b560da6c1
parent ba026f51b67a0e61d0df6b5a95b208f5e2e75d2d

Use the right directory for the csv file.

And return an error if absent.

Test: appcompat.sh
Bug: 77513322

(cherry picked from commit 3b23f7568077a10cb3dfd0bb7d1c5f4c035d65dc)

Change-Id: Iada6095a8a992805779993d48524f1654f523de9
Merged-In: I212df0f9eac323fa6b5e2cf272684a31bf14cdea

tools/veridex/appcompat.sh

diff --git a/tools/veridex/appcompat.sh b/tools/veridex/appcompat.sh
index 46d62db9..99537a4 100755
--- a/tools/veridex/appcompat.sh
+++ b/tools/veridex/appcompat.sh
@@ -57,8 +57,20 @@
   ANDROID_HOST_OUT=${OUT}/host/linux-x86
 fi
 
+extra_flags=
+
+# If --api-flags is not passed directly, take it from the build.
+if [[ "$@" != "*--api-flags=*" ]]; then
+  file="${OUT}/soong/hiddenapi/hiddenapi-flags.csv"
+  if [ ! -f $file ]; then
+    echo "Missing API flags file $file"
+    exit 1
+  fi
+  extra_flags="--api-flags=$file"
+fi
+
 
 ${ANDROID_HOST_OUT}/bin/veridex \
     --core-stubs=${PACKAGING}/core_dex_intermediates/classes.dex:${PACKAGING}/oahl_dex_intermediates/classes.dex \
-    --api-flags=${PACKAGING}/hiddenapi-flags.csv \
+    $extra_flags \
     $@