[zorg] r311925 - [sanitizer] Update i686->i386 to match rename in compiler-rt

[Michal Gorny via llvm-commits]

Author: mgorny
Date: Mon Aug 28 13:31:41 2017
New Revision: 311925

URL: http://llvm.org/viewvc/llvm-project?rev=311925&view=rev
Log:
[sanitizer] Update i686->i386 to match rename in compiler-rt

Update arch name used by the Android buildbot to reference "i386" rather
than "i686" since this is the only x86 library name post D26796 + D26764.
This is necessary so that the scripts push the correct library file.

Differential Revision: https://reviews.llvm.org/D37226

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.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=311925&r1=311924&r2=311925&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Mon Aug 28 13:31:41 2017
@@ -65,17 +65,17 @@ CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPT
 
 build_android_ndk aarch64 arm64
 build_android_ndk arm arm
-build_android_ndk i686 x86
+build_android_ndk i386 x86
 
 echo @@@BUILD_STEP run cmake@@@
 configure_android aarch64 aarch64-linux-android
 configure_android arm armv7-linux-androideabi
-configure_android i686 i686-linux-android
+configure_android i386 i686-linux-android
 
 build_android aarch64
 build_android arm
-build_android i686
+build_android i386
 
 # Testing armv7 instead of plain arm to work around
 # https://code.google.com/p/android/issues/detail?id=68779
-test_android i686:x86 aarch64:arm64-v8a arm:armeabi-v7a
+test_android i386:x86 aarch64:arm64-v8a arm:armeabi-v7a