[zorg] r312067 - Revert r311925: i686 is back.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Tue Aug 29 16:41:48 2017
New Revision: 312067

URL: http://llvm.org/viewvc/llvm-project?rev=312067&view=rev
Log:
Revert r311925: i686 is back.

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