Merge pull request #74160 from hyp/eng/fix-android-synchro

[android] Fix Synchronization Android build

Author: hyp

stdlib/public/Synchronization/CMakeLists.txt

@@ -46,7 +46,7 @@ set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
   Mutex/Mutex.swift
 )
 
-# Linux sources
+# Linux and Android sources
 
 set(SWIFT_SYNCHRONIZATION_LINUX_SOURCES
   Mutex/LinuxImpl.swift
@@ -115,6 +115,8 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
     ${SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES}
   SWIFT_MODULE_DEPENDS_LINUX
     Glibc
+  SWIFT_MODULE_DEPENDS_ANDROID
+    Android
   SWIFT_MODULE_DEPENDS_WINDOWS
     WinSDK
 

stdlib/public/Synchronization/Mutex/LinuxImpl.swift

@@ -11,7 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 import _SynchronizationShims
+#if canImport(Android)
+import Android
+#else
 import Glibc
+#endif
 
 extension Atomic where Value == UInt32 {
   // This returns 'false' on success and 'true' on error. Check 'errno' for the