[android] do not build the builtin float overlay for android (NDK's clang module map doesn't have it)

Author: hyp

stdlib/public/ClangOverlays/CMakeLists.txt

@@ -1,17 +1,19 @@
-add_swift_target_library(swift_Builtin_float
-    ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
-    IS_SDK_OVERLAY
+if(NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT)
+  add_swift_target_library(swift_Builtin_float
+      ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
+      IS_SDK_OVERLAY
 
-    GYB_SOURCES
-      float.swift.gyb
+      GYB_SOURCES
+        float.swift.gyb
 
-    SWIFT_COMPILE_FLAGS
-      ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
-      ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-      -Xfrontend -previous-module-installname-map-file -Xfrontend "${SWIFT_SOURCE_DIR}/stdlib/linker-support/previous-module-installname.json"
+      SWIFT_COMPILE_FLAGS
+        ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
+        ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+        -Xfrontend -previous-module-installname-map-file -Xfrontend "${SWIFT_SOURCE_DIR}/stdlib/linker-support/previous-module-installname.json"
 
-    LINK_FLAGS
-      ${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}
+      LINK_FLAGS
+        ${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}
 
-    INSTALL_IN_COMPONENT stdlib
-    MACCATALYST_BUILD_FLAVOR zippered)
+      INSTALL_IN_COMPONENT stdlib
+      MACCATALYST_BUILD_FLAVOR zippered)
+endif()

utils/build.ps1

@@ -832,6 +832,9 @@ function Build-CMakeProject {
       TryAdd-KeyValue $Defines SWIFT_ANDROID_NDK_PATH "$androidNDKPath"
       TryAdd-KeyValue $Defines CMAKE_C_COMPILER_WORKS YES
       TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER_WORKS YES
+      # The current Android NDK ships with Clang 17,
+      # which doesn't provide the _Builtin_float module.
+      TryAdd-KeyValue $Defines SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT YES
     }
 
     TryAdd-KeyValue $Defines CMAKE_BUILD_TYPE Release