android: detect NDK path from environmental variable, starting to fix Swift default linker flags, attempt at copying libicu libraries automatically (doesn't work)

Author: zhuowei

CMakeLists.txt

@@ -117,7 +117,7 @@ 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
+set(SWIFT_ANDROID_NDK_PATH "$ENV{ANDROID_NDK_HOME}" 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
@@ -431,8 +431,11 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
   is_sdk_requested(ANDROID swift_build_android)
   if(swift_build_android AND ${swift_can_crosscompile_stdlib})
+    if("${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
+      message(FATAL_ERROR "environmental variable ANDROID_NDK_HOME not set")
+    endif()
     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_SDK_ANDROID_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-16/arch-arm")
 
     set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")

cmake/modules/AddSwift.cmake

@@ -169,7 +169,7 @@ function(_add_variant_link_flags
         "-ldl"
         "-L${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.8"
         "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so"
-        "-L/home/zhuowei/libiconv-libicu-android/armeabi-v7a")
+        "-L${CMAKE_SOURCE_DIR}/../libiconv-libicu-android/armeabi-v7a")
   else()
     list(APPEND result "-lobjc")
   endif()

cmake/modules/FindICU.cmake

@@ -27,8 +27,8 @@ foreach(MODULE ${ICU_FIND_COMPONENTS})
   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")
+set(ICU_I18N_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../icu/source/i18n")
+set(ICU_UC_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../icu/source/common")
 
 find_package_handle_standard_args(ICU DEFAULT_MSG ${ICU_REQUIRED})
 mark_as_advanced(${ICU_REQUIRED})

lib/Driver/Driver.cpp

@@ -1075,6 +1075,16 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
           });
         }
       }
+    } else if (TC.getTriple().isAndroid()) {
+      const char* ndkhome = getenv("ANDROID_NDK_HOME");
+      if (!ndkhome) {
+        llvm::errs() <<
+          "ANDROID_NDK_HOME environmental variable not set; "
+          "won't be able to build Android programs. Please "
+          "set it to the path of the NDK\n";
+      } else {
+        OI.SDKPath = std::string(ndkhome) + "/platforms/android-16/arch-arm";
+      }
     }
 
     if (!OI.SDKPath.empty()) {

lib/Driver/ToolChains.cpp

@@ -1010,6 +1010,31 @@ toolchains::Linux::constructInvocation(const LinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(LibProfile));
   }
 
+  if (getTriple().isAndroid()) {
+    // FIXME: Android: hard-coded paths to arm; needs to fix for arm64, x86
+    Arguments.push_back("-target");
+    Arguments.push_back("armv7-none-linux-androideabi");
+    //Arguments.push_back(context.Args.MakeArgString(getTriple().str()));
+
+    const char* ndkhome = getenv("ANDROID_NDK_HOME");
+    assert(ndkhome && "ANDROID_NDK_HOME needs to be set to NDK "
+      "install directory for linking");
+
+    auto libgccpath = Twine(ndkhome) + "/toolchains/"
+      "arm-linux-androideabi-4.8/prebuilt/linux-x86_64/"
+      "lib/gcc/arm-linux-androideabi/4.8";
+    Arguments.push_back("-L");
+    Arguments.push_back(context.Args.MakeArgString(libgccpath));
+
+    auto libcxxpath = Twine(ndkhome) + "/sources/"
+      "cxx-stl/llvm-libc++/libs/armeabi-v7a";
+    Arguments.push_back("-L");
+    Arguments.push_back(context.Args.MakeArgString(libcxxpath));
+
+    Arguments.push_back("-lgcc");
+    Arguments.push_back("-lc");
+  }
+
   // FIXME: We probably shouldn't be adding an rpath here unless we know ahead
   // of time the standard library won't be copied.
   Arguments.push_back("-Xlinker");
@@ -1032,7 +1057,8 @@ toolchains::Linux::constructInvocation(const LinkJobAction &job,
   Arguments.push_back("-Xlinker");
   Arguments.push_back("-T");
   Arguments.push_back(
-      context.Args.MakeArgString(Twine(RuntimeLibPath) + "/x86_64/swift.ld"));
+      context.Args.MakeArgString(Twine(RuntimeLibPath) + "/" +
+        getTriple().getArchName() + "/swift.ld"));
 
   // This should be the last option, for convenience in checking output.
   Arguments.push_back("-o");

stdlib/public/Bionic/CMakeLists.txt

@@ -14,7 +14,7 @@ foreach(input ${sources})
   #      "${output_dir}/${input}")
   list(APPEND commands
       COMMAND
-        "sed" "-e" "s@SYSROOT@/home/zhuowei/ndk/platforms/android-16/arch-arm@g"
+        "sed" "-e" "s@SYSROOT@${SWIFT_ANDROID_NDK_PATH}/platforms/android-16/arch-arm@g"
         "${CMAKE_CURRENT_SOURCE_DIR}/${input}"
         ">"
         "${output_dir}/${input}")
@@ -39,3 +39,15 @@ add_swift_library(swiftGlibc IS_SDK_OVERLAY
   TARGET_SDKS ANDROID
   INSTALL_IN_COMPONENT stdlib-experimental)
 
+# FIXME: Android: find where this belongs
+set(iculibs
+    "${CMAKE_SOURCE_DIR}/../libiconv-libicu-android/armeabi-v7a/libicudata.so"
+    "${CMAKE_SOURCE_DIR}/../libiconv-libicu-android/armeabi-v7a/libicuuc.so"
+    "${CMAKE_SOURCE_DIR}/../libiconv-libicu-android/armeabi-v7a/libicui18n.so"
+)
+
+# TODO: Android: copy this during build as well
+
+swift_install_in_component(stdlib
+    FILES ${iculibs}
+    DESTINATION "lib/swift/android/armv7")