android: hardcode ICU path, add NDK to sysroot, started copying link/compile job pools from LLVM's cmake list, force -j1 and split dwarfs when compiling

Author: zhuowei

CMakeLists.txt

@@ -117,6 +117,28 @@ 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")
 
+# 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.")
+if(SWIFT_PARALLEL_COMPILE_JOBS)
+  if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_MAKE_PROGRAM MATCHES "ninja")
+    message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.")
+  else()
+    set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${SWIFT_PARALLEL_COMPILE_JOBS})
+    set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
+  endif()
+endif()
+
+set(SWIFT_PARALLEL_LINK_JOBS "1" CACHE STRING
+  "Define the maximum number of concurrent link jobs.")
+if(SWIFT_PARALLEL_LINK_JOBS)
+  if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_MAKE_PROGRAM MATCHES "ninja")
+    message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.")
+  else()
+    set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${SWIFT_PARALLEL_LINK_JOBS})
+    set(CMAKE_JOB_POOL_LINK link_job_pool)
+  endif()
+endif()
 #
 # User-configurable Darwin-specific options.
 #
@@ -408,6 +430,8 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   is_sdk_requested(ANDROID swift_build_android)
   if(swift_build_android AND ${swift_can_crosscompile_stdlib})
     configure_sdk_unix(ANDROID "Android" "android" "android" "armv7" "armv7-none-linux-androideabi")
+    set(SWIFT_SDK_ANDROID_PATH "/home/zhuowei/ndk/platforms/android-16/arch-arm")
+
     set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")
   endif()

cmake/modules/AddSwift.cmake

@@ -48,6 +48,12 @@ function(_add_variant_c_compile_link_flags
   list(APPEND result
     "-isysroot" "${SWIFT_SDK_${sdk}_PATH}")
 
+  if("${sdk}" STREQUAL "ANDROID")
+    list(APPEND result
+        "--sysroot=${SWIFT_SDK_${sdk}_PATH}")
+  endif()
+
+
   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     list(APPEND result
         "-arch" "${arch}"
@@ -94,6 +100,12 @@ function(_add_variant_c_compile_flags
     list(APPEND result "-DNDEBUG")
   endif()
 
+  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")
+  endif()
+
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -1051,7 +1063,7 @@ function(_add_swift_library_single target name)
       # isn't the standard library.  The standard library uses a
       # linker script that isn't supported by the gold linker.
       if(NOT SWIFTLIB_SINGLE_IS_STDLIB)
-        list(APPEND link_flags "-fuse-ld=gold")
+        list(APPEND link_flags "-fuse-ld=gold -Wl,--gdb-index")
       endif()
     endif()
   endif()

cmake/modules/FindICU.cmake

@@ -1,5 +1,7 @@
 # Find libicu's libraries
 
+# Android FIXME: ICU
+
 include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
@@ -24,6 +26,9 @@ foreach(MODULE ${ICU_FIND_COMPONENTS})
     set(ICU_${MODULE}_LIBRARIES ${ICU_${MODULE}_LIBRARY})
   endif()
 endforeach()
+message("FIXME Android: ICU")
+set(ICU_I18N_INCLUDE_DIR "/home/zhuowei/icu/source/i18n")
+set(ICU_UC_INCLUDE_DIR "/home/zhuowei/icu/source/common")
 
 find_package_handle_standard_args(ICU DEFAULT_MSG ${ICU_REQUIRED})
 mark_as_advanced(${ICU_REQUIRED})

utils/build-script-impl

@@ -175,7 +175,7 @@ KNOWN_SETTINGS=(
     swift-enable-target-android "1"              "Enable compiler support for targeting Android"
     swift-runtime-enable-dtrace "0"              "Enable runtime dtrace support"
     swift-runtime-enable-leak-checker   "0"              "Enable leaks checking routines in the runtime"
-    use-gold-linker             ""               "Enable using the gold linker"
+    use-gold-linker             "1"               "Enable using the gold linker"
     darwin-toolchain-bundle-identifier ""        "CFBundleIdentifier for xctoolchain info plist"
     darwin-toolchain-display-name      ""        "Display Name for xctoolcain info plist"
     darwin-toolchain-name              ""        "Directory name for xctoolchain"
@@ -1032,8 +1032,8 @@ COMMON_CMAKE_OPTIONS=(
     -G "${CMAKE_GENERATOR}"
 )
 
-COMMON_C_FLAGS=""
-COMMON_CXX_FLAGS=""
+COMMON_C_FLAGS="-gsplit-dwarf"
+COMMON_CXX_FLAGS="-gsplit-dwarf"
 
 if [[ "${ENABLE_ASAN}" ]] ; then
     COMMON_CMAKE_OPTIONS=(
@@ -1083,6 +1083,7 @@ fi
 if [[ "$DISTCC" ]] ; then
     BUILD_ARGS="${BUILD_ARGS} -j $(distcc -j)"
 fi
+BUILD_ARGS="${BUILD_ARGS} -j1"
 
 case "${CMAKE_GENERATOR}" in
     Ninja)
@@ -1474,8 +1475,8 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
                 # gold linker support.
                 cmake_options=(
                     "${cmake_options[@]}"
-                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold"
-                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold"
+                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold -Wl,--gdb-index"
+                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold -Wl,--gdb-index"
                 )
             fi
         else