android: add path to libgcc; not working (we probably need real compiler_rt)

Author: zhuowei

CMakeLists.txt

@@ -117,6 +117,8 @@ set(SWIFT_NATIVE_CLANG_TOOLS_PATH "" CACHE STRING
 set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "" CACHE STRING
     "Path to the directory that contains Swift tools that are executable on the build machine")
 
+set(SWIFT_ANDROID_NDK_PATH "/home/zhuowei/ndk" CACHE STRING
+    "Path to the directory that contains the Android NDK tools that are executable on the build machine")
 # The following only works with the Ninja generator in CMake >= 3.0.
 set(SWIFT_PARALLEL_COMPILE_JOBS "" CACHE STRING
   "Define the maximum number of concurrent compilation jobs.")

cmake/modules/AddSwift.cmake

@@ -102,8 +102,8 @@ function(_add_variant_c_compile_flags
 
   if("${sdk}" STREQUAL "ANDROID")
     list(APPEND result
-        "-I/home/zhuowei/ndk/sources/cxx-stl/llvm-libc++/libcxx/include"
-        "-I/home/zhuowei/ndk/sources/android/support/include")
+        "-I${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libcxx/include"
+        "-I${SWIFT_ANDROID_NDK_PATH}/sources/android/support/include")
   endif()
 
   set("${result_var_name}" "${result}" PARENT_SCOPE)
@@ -163,6 +163,11 @@ function(_add_variant_link_flags
 
   if("${sdk}" STREQUAL "LINUX")
     list(APPEND result "-lpthread" "-ldl")
+  elseif("${sdk}" STREQUAL "ANDROID")
+    list(APPEND result
+        "-ldl"
+        "-L${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.8/thumb"
+        "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_shared.so")
   else()
     list(APPEND result "-lobjc")
   endif()

utils/build-script-impl

@@ -1083,7 +1083,7 @@ fi
 if [[ "$DISTCC" ]] ; then
     BUILD_ARGS="${BUILD_ARGS} -j $(distcc -j)"
 fi
-BUILD_ARGS="${BUILD_ARGS} -j1"
+BUILD_ARGS="${BUILD_ARGS} -j2"
 
 case "${CMAKE_GENERATOR}" in
     Ninja)