Merge pull request #85872 from edymtt/edymtt/android-build-builtin-float-before-math

CMake Android: ensure _Builtin_float is built before _math

Author: edymtt

Runtimes/Overlay/Android/Math/CMakeLists.txt

@@ -5,7 +5,8 @@ set_target_properties(swift_math PROPERTIES
   Swift_MODULE_NAME _math)
 target_link_libraries(swift_math PRIVATE
   SwiftAndroid
-  swiftCore)
+  swiftCore
+  swift_Builtin_float)
 
 install(TARGETS swift_math
   EXPORT SwiftOverlayTargets

stdlib/public/Platform/CMakeLists.txt

@@ -167,6 +167,7 @@ add_swift_target_library(swift_math ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_O
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS "ANDROID"
     INSTALL_IN_COMPONENT sdk-overlay
+    SWIFT_MODULE_DEPENDS_ANDROID _Builtin_float
     DEPENDS android_modulemap)
 
 add_swift_target_library(swiftAndroid ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY