Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh =================================================================== --- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh +++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh @@ -65,17 +65,17 @@ 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