From 9c363f11ce7e88f1dcfcf0c36583b7a1e3a66b3b Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 29 Aug 2017 23:41:48 +0000 Subject: [PATCH] Revert r311925: i686 is back. llvm-svn: 312067 --- zorg/buildbot/builders/sanitizers/buildbot_android.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android.sh b/zorg/buildbot/builders/sanitizers/buildbot_android.sh index 8a3a7f0f9..2beb86e35 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_android.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_android.sh @@ -65,17 +65,17 @@ CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_LIBXML2_ENABLED=OFF" 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