[Concurrency] Fix Android C libdispatch build (#35881)

* [Concurrency] Fix Android C libdispatch build

We need to pass CMAKE_ANDROID_NDK and CMAKE_ANDROID_ARCH_ABI to the
build.

* Set proper ANDROID_ARCH_ABI

* Add -DCMAKE_ANDROID_API to C libdispatch build

* Fix compiler config for Android

Author: drexin

cmake/modules/Libdispatch.cmake

@@ -55,6 +55,12 @@ foreach(sdk ${DISPATCH_SDKS})
       list(APPEND ARCHS "${SWIFT_HOST_VARIANT_ARCH}")
     endif()
   endif()
+  
+  if(sdk STREQUAL ANDROID)
+    set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS)
+  else()
+    set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER};-DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER})
+  endif()
 
   foreach(arch ${ARCHS})
     set(LIBDISPATCH_VARIANT_NAME "libdispatch-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
@@ -65,9 +71,8 @@ foreach(sdk ${DISPATCH_SDKS})
                         CMAKE_ARGS
                           -DCMAKE_AR=${CMAKE_AR}
                           -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-                          -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER}
+                          ${SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS}
                           -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-                          -DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER}
                           -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
                           -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                           -DCMAKE_INSTALL_LIBDIR=lib
@@ -77,6 +82,9 @@ foreach(sdk ${DISPATCH_SDKS})
                           -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                           -DCMAKE_SYSTEM_NAME=${SWIFT_SDK_${sdk}_NAME}
                           -DCMAKE_SYSTEM_PROCESSOR=${arch}
+                          "-DCMAKE_ANDROID_NDK=${SWIFT_ANDROID_NDK_PATH}"
+                          -DCMAKE_ANDROID_ARCH_ABI=${SWIFT_SDK_ANDROID_ARCH_${arch}_ABI}
+                          -DCMAKE_ANDROID_API=${SWIFT_ANDROID_API_LEVEL}
                           -DBUILD_SHARED_LIBS=YES
                           -DENABLE_SWIFT=NO
                           -DENABLE_TESTING=NO
@@ -139,18 +147,20 @@ foreach(sdk ${DISPATCH_SDKS})
                           CMAKE_ARGS
                             -DCMAKE_AR=${CMAKE_AR}
                             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-                            -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER}
+                            ${SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS}
                             -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-                            -DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER}
                             -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
                             -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                             -DCMAKE_INSTALL_LIBDIR=lib
                             -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                             -DCMAKE_LINKER=${CMAKE_LINKER}
                             -DCMAKE_RANLIB=${CMAKE_RANLIB}
                             -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                            -DCMAKE_SYSTEM_NAME=${sdk}
+                            -DCMAKE_SYSTEM_NAME=${SWIFT_SDK_${sdk}_NAME}
                             -DCMAKE_SYSTEM_PROCESSOR=${arch}
+                            "-DCMAKE_ANDROID_NDK=${SWIFT_ANDROID_NDK_PATH}"
+                            -DCMAKE_ANDROID_ARCH_ABI=${SWIFT_SDK_ANDROID_ARCH_${arch}_ABI}
+                            -DCMAKE_ANDROID_API=${SWIFT_ANDROID_API_LEVEL}
                             -DBUILD_SHARED_LIBS=NO
                             -DENABLE_SWIFT=NO
                             -DENABLE_TESTING=NO

cmake/modules/SwiftConfigureSDK.cmake

@@ -304,18 +304,22 @@ macro(configure_sdk_unix name architectures)
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "armv7-unknown-linux-androideabi")
         # The Android ABI isn't part of the module triple.
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_MODULE "armv7-unknown-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ABI "armeabi-v7a")
       elseif("${arch}" STREQUAL "aarch64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "aarch64-linux-android")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "aarch64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "aarch64-unknown-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ABI "arm64-v8a")
       elseif("${arch}" STREQUAL "i686")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "i686-linux-android")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "i686")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "i686-unknown-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ABI "x86")
       elseif("${arch}" STREQUAL "x86_64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "x86_64-linux-android")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "x86_64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "x86_64-unknown-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ABI "x86_64")
       else()
         message(FATAL_ERROR "unknown arch for android SDK: ${arch}")
       endif()