[zorg] r306642 - [asan] Fix Android architectures

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Jun 28 21:20:13 2017
New Revision: 306642

URL: http://llvm.org/viewvc/llvm-project?rev=306642&view=rev
Log:
[asan] Fix Android architectures

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh?rev=306642&r1=306641&r2=306642&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Wed Jun 28 21:20:13 2017
@@ -58,18 +58,18 @@ CMAKE_COMMON_OPTIONS=-DLLVM_ENABLE_ASSER
 build_android() {
   CPU=$1
   TRIPLE=$2
-  build_android_ndk $CPU
+  NDK_ARCH=$3
+  ABI=$4
+  build_android_ndk $CPU $NDK_ARCH
   build_compiler_rt $CPU $TRIPLE
   build_llvm_symbolizer $CPU $TRIPLE
+  test_android $CPU $ABI @@@STEP_FAILURE@@@
 }
 
+build_android aarch64 aarch64-linux-android arm64 arm64-v8a
+
 # Testing armv7 instead of plain arm to work around
 # https://code.google.com/p/android/issues/detail?id=68779
-build_android arm armv7-linux-androideabi armeabi-v7a
-test_android arm armeabi-v7a @@@STEP_FAILURE@@@
-
-build_android arm64 aarch64-linux-android arm64-v8a
-test_android arm64 arm64-v8a @@@STEP_FAILURE@@@
+build_android arm armv7-linux-androideabi arm armeabi-v7a
 
-build_android x86 i686-linux-android x86
-test_android x86 x86 @@@STEP_FAILURE@@@
+build_android i686 i686-linux-android x86 i686

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=306642&r1=306641&r2=306642&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Wed Jun 28 21:20:13 2017
@@ -29,9 +29,10 @@ function download_android_tools {
 function build_android_ndk {
   local NDK_DIR=android_ndk
   local _arch=$1
+  local _ndk_arch=$2
   if [[ ! -d $NDK_DIR/standalone-$_arch ]] ; then 
     echo @@@BUILD_STEP building Android NDK for $_arch@@@
-    $NDK_DIR/build/tools/make_standalone_toolchain.py --api 24 --force --arch $_arch --install-dir $NDK_DIR/standalone-$_arch
+    $NDK_DIR/build/tools/make_standalone_toolchain.py --api 24 --force --arch $_ndk_arch --install-dir $NDK_DIR/standalone-$_arch
   fi
 }