commit 3fce25391d76f132efb1a6d613253f1c96242439
author Vitaly Buka <vitalybuka@google.com> Fri Nov 13 22:53:44 2020 -0800
committer GitHub <noreply@github.com> Fri Nov 13 22:53:44 2020 -0800
tree 0a4d4c7cac6f96a9fa0f3b853dd835fa48c65724
parent d541403786666845d6f601e70bd50ec31cb6b0a7

[sanitizer] Simplify shell script

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
index 829ba24..a2ba535 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
@@ -232,10 +232,9 @@
 
   export DEVICE_DESCRIPTION=$_arch/$_build_flavor/$_build_id
 
-  if [[ -f $ANDROID_TOOLCHAIN/sysroot/usr/lib/${_arch}-linux-android/libc++_shared.so ]] ; then
+  local LIBCXX_SHARED=$ANDROID_TOOLCHAIN/sysroot/usr/lib/${_arch}-linux-androideabi/libc++_shared.so
+  if [[ ! -f $LIBCXX_SHARED ]] ; then
     local LIBCXX_SHARED=$ANDROID_TOOLCHAIN/sysroot/usr/lib/${_arch}-linux-android/libc++_shared.so
-  else
-    local LIBCXX_SHARED=$ANDROID_TOOLCHAIN/sysroot/usr/lib/${_arch}-linux-androideabi/libc++_shared.so
   fi
   local SYMBOLIZER_BIN=$ROOT/llvm_build_android_$_arch/bin/llvm-symbolizer
   local RT_DIR=$($ROOT/llvm_build64/bin/clang -print-resource-dir)/lib/linux