commit e67fd203b3e94b552a66b52efbfc806c8041fd79
author Nicolas Geoffray <ngeoffray@google.com> Tue Apr 21 15:56:52 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Apr 21 20:19:31 2020 +0000
tree cdf950cb19a4c9ff015254510b17ed2ce19044dd
parent 75c3ff378636c844cb9715c18c2996619790281f

Use ANDROID_HOST_OUT/bin/deapexer instead of just deapexer.

Test: buildbot-build.sh
Change-Id: Ib6c057f38842396bcefd94c2e7a6a21e27722425

tools/buildbot-build.sh

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 3c08394..ba87284 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -150,7 +150,11 @@
     # If there is a conscrypt apex prebuilt, extract it.
     rm -rf $conscrypt_dir
     mkdir $conscrypt_dir
-    deapexer extract $conscrypt_apex $conscrypt_dir
+    if [[ -z "${ANDROID_HOST_OUT}" ]]; then
+      echo 'ANDROID_HOST_OUT environment variable is empty; using $out_dir/host/linux-x86'
+      ANDROID_HOST_OUT=$out_dir/host/linux-x86
+    fi
+    $ANDROID_HOST_OUT/bin/deapexer extract $conscrypt_apex $conscrypt_dir
   fi
   # Temporary fix for libjavacrypto.so dependencies in libcore and jvmti tests (b/147124225).
   conscrypt_libs="libjavacrypto.so libcrypto.so libssl.so"