Support Android x86. (#3314)

konan/konan.properties

@@ -372,33 +372,6 @@ targetSysRoot.android_arm32 = target-sysroot-1-android_ndk
 linkerKonanFlags.android_arm32 = -lm -lstdc++ -landroid -llog -latomic
 
 # Android ARM64, based on NDK.
-targetToolchain.macos_x64-android_x64 = target-toolchain-1-osx-android_ndk
-dependencies.macos_x64-android_x64 = \
-    clang-llvm-6.0.1-darwin-macos \
-    target-sysroot-1-android_ndk \
-    target-toolchain-1-osx-android_ndk \
-    libffi-3.2.1-3-darwin-macos
-targetToolchain.linux_x64-android_x64 = target-toolchain-1-linux-android_ndk
-dependencies.linux_x64-android_x64 = \
-    clang-llvm-6.0.1-linux-x86-64 \
-    target-sysroot-1-android_ndk \
-    target-toolchain-1-linux-android_ndk \
-    libffi-3.2.1-2-linux-x86-64
-targetToolchain.mingw_x64-android_x64 = target-toolchain-1-windows-android_ndk
-dependencies.mingw_x64-android_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
-    target-sysroot-1-android_ndk \
-    target-toolchain-1-windows-android_ndk \
-    libffi-3.2.1-mingw-w64-x86-64
-
-quadruple.android_arm64 = aarch64-linux-android
-entrySelector.android_arm64 =  -Wl,--defsym -Wl,main=Konan_main
-clangFlags.android_arm64 = -cc1 -target-cpu cortex-a57 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
-targetSysRoot.android_arm64 = target-sysroot-1-android_ndk
-linkerKonanFlags.android_arm64 = -lm -lstdc++ -landroid -llog -latomic
-linkerNoDebugFlags.android_arm64 = -Wl,-S
-
-# Android X64, based on NDK.
 targetToolchain.macos_x64-android_arm64 = target-toolchain-1-osx-android_ndk
 dependencies.macos_x64-android_arm64 = \
     clang-llvm-6.0.1-darwin-macos \
@@ -418,12 +391,73 @@ dependencies.mingw_x64-android_arm64 = \
     target-toolchain-1-windows-android_ndk \
     libffi-3.2.1-mingw-w64-x86-64
 
+quadruple.android_arm64 = aarch64-linux-android
+entrySelector.android_arm64 =  -Wl,--defsym -Wl,main=Konan_main
+clangFlags.android_arm64 = -cc1 -target-cpu cortex-a57 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+clangOptFlags.android_arm64 = -O3 -ffunction-sections
+clangNooptFlags.android_arm64 = -O1
+targetSysRoot.android_arm64 = target-sysroot-1-android_ndk
+linkerKonanFlags.android_arm64 = -lm -lstdc++ -landroid -llog -latomic
+linkerNoDebugFlags.android_arm64 = -Wl,-S
+
+# Android X86, based on NDK.
+targetToolchain.macos_x64-android_x86 = target-toolchain-1-osx-android_ndk
+dependencies.macos_x64-android_x86 = \
+    clang-llvm-6.0.1-darwin-macos \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-osx-android_ndk \
+    libffi-3.2.1-3-darwin-macos
+targetToolchain.linux_x64-android_x86 = target-toolchain-1-linux-android_ndk
+dependencies.linux_x64-android_x86 = \
+    clang-llvm-6.0.1-linux-x86-64 \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-linux-android_ndk \
+    libffi-3.2.1-2-linux-x86-64
+targetToolchain.mingw_x64-android_x86 = target-toolchain-1-windows-android_ndk
+dependencies.mingw_x64-android_x86 = \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-windows-android_ndk \
+    libffi-3.2.1-mingw-w64-x86-64
+
+quadruple.android_x86 = i686-linux-android
+entrySelector.android_x86 = -Wl,--defsym -Wl,main=Konan_main
+clangFlags.android_x86 = -cc1 -target-cpu i686 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+clangOptFlags.android_x86 = -O3 -ffunction-sections
+clangNooptFlags.android_x86 = -O1
+targetSysRoot.android_x86 = target-sysroot-1-android_ndk
+linkerKonanFlags.android_x86 = -lm -lstdc++ -landroid -llog -latomic
+linkerNoDebugFlags.android_x86 = -Wl,-S
+
+# Android X64, based on NDK.
+targetToolchain.macos_x64-android_x64 = target-toolchain-1-osx-android_ndk
+dependencies.macos_x64-android_x64 = \
+    clang-llvm-6.0.1-darwin-macos \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-osx-android_ndk \
+    libffi-3.2.1-3-darwin-macos
+targetToolchain.linux_x64-android_x64 = target-toolchain-1-linux-android_ndk
+dependencies.linux_x64-android_x64 = \
+    clang-llvm-6.0.1-linux-x86-64 \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-linux-android_ndk \
+    libffi-3.2.1-2-linux-x86-64
+targetToolchain.mingw_x64-android_x64 = target-toolchain-1-windows-android_ndk
+dependencies.mingw_x64-android_x64 = \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    target-sysroot-1-android_ndk \
+    target-toolchain-1-windows-android_ndk \
+    libffi-3.2.1-mingw-w64-x86-64
+
 quadruple.android_x64 = x86_64-linux-android
 entrySelector.android_x64 = -Wl,--defsym -Wl,main=Konan_main
 clangFlags.android_x64 = -cc1 -target-cpu x86-64 -emit-obj -disable-llvm-passes -x ir -femulated-tls -mrelocation-model pic
+clangOptFlags.android_x64 = -O3 -ffunction-sections
+clangNooptFlags.android_x64 = -O1
 targetSysRoot.android_x64 = target-sysroot-1-android_ndk
 linkerKonanFlags.android_x64 = -lm -lstdc++ -landroid -llog -latomic
-linkerNoDebugFlags.android_ax64 = -Wl,-S
+linkerNoDebugFlags.android_x64 = -Wl,-S
+
 
 # Windows x86-64, based on mingw-w64.
 llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2