From 74d2a66a27927860659967ff6c9c18fc4d37bb11 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 5 Jun 2024 13:14:59 -0700
Subject: [PATCH] [androd] Fix Synchronization Android build

Add Android import for Mutex implementation
---
 stdlib/public/Synchronization/CMakeLists.txt        | 4 +++-
 stdlib/public/Synchronization/Mutex/LinuxImpl.swift | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/stdlib/public/Synchronization/CMakeLists.txt b/stdlib/public/Synchronization/CMakeLists.txt
index 9d9ec0524cd2a..bdeb595ba4096 100644
--- a/stdlib/public/Synchronization/CMakeLists.txt
+++ b/stdlib/public/Synchronization/CMakeLists.txt
@@ -40,7 +40,7 @@ set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
   Mutex/DarwinImpl.swift
 )
 
-# Linux sources
+# Linux and Android sources
 
 set(SWIFT_SYNCHRONIZATION_LINUX_SOURCES
   Mutex/LinuxImpl.swift
@@ -102,6 +102,8 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
     Darwin
   SWIFT_MODULE_DEPENDS_LINUX
     Glibc
+  SWIFT_MODULE_DEPENDS_ANDROID
+    Android
   SWIFT_MODULE_DEPENDS_WINDOWS
     WinSDK
 
diff --git a/stdlib/public/Synchronization/Mutex/LinuxImpl.swift b/stdlib/public/Synchronization/Mutex/LinuxImpl.swift
index ffb05b4f45b31..23536b2345fd4 100644
--- a/stdlib/public/Synchronization/Mutex/LinuxImpl.swift
+++ b/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