Merge pull request #210 from buttaface/droid

Android: add native support

Author: benlangmuir

Package.swift

@@ -190,7 +190,7 @@ let package = Package(
 // by the external environment. This allows sourcekit-lsp to take advantage of the automation used
 // for building the swift toolchain, such as `update-checkout`, or cross-repo PR tests.
 
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
 #else
 import Darwin.C

Sources/SKSupport/Platform.swift

@@ -17,9 +17,8 @@ extension Platform {
   /// The file extension used for a dynamic library on this platform.
   public var dynamicLibraryExtension: String {
     switch self {
-    case .android: return "so"
     case .darwin: return "dylib"
-    case .linux: return "so"
+    case .linux, .android: return "so"
     }
   }
 }

Sources/SKSupport/dlopen.swift

@@ -62,9 +62,11 @@ public struct DLOpenFlags: RawRepresentable, OptionSet {
     public static let deepBind: DLOpenFlags = DLOpenFlags(rawValue: 0)
   #else
     public static let first: DLOpenFlags = DLOpenFlags(rawValue: 0)
+  #if !os(Android)
     public static let deepBind: DLOpenFlags = DLOpenFlags(rawValue: RTLD_DEEPBIND)
   #endif
   #endif
+  #endif
 
   public var rawValue: Int32
 

Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift

@@ -46,6 +46,8 @@ final class SwiftSourceKitFramework {
     self.path = path
     #if os(Windows)
     self.dylib = try dlopen(path.pathString, mode: [])
+    #elseif os(Android)
+    self.dylib = try dlopen(path.pathString, mode: [.lazy, .local, .first])
     #else
     self.dylib = try dlopen(path.pathString, mode: [.lazy, .local, .first, .deepBind])
     #endif

Utilities/build-script-helper.py

@@ -44,10 +44,21 @@ def get_swiftpm_options(args):
       # For <Block.h>
       '-Xcxx', '-I', '-Xcxx',
       os.path.join(args.toolchain, 'usr', 'lib', 'swift', 'Block'),
-      # Library rpath for swift, dispatch, Foundation, etc. when installing
-      '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/linux',
     ]
 
+    if 'ANDROID_DATA' in os.environ:
+      swiftpm_args += [
+        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
+        # SwiftPM will otherwise try to compile against GNU strerror_r on
+        # Android and fail.
+        '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
+      ]
+    else:
+      # Library rpath for swift, dispatch, Foundation, etc. when installing
+      swiftpm_args += [
+        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/linux',
+      ]
+
   return swiftpm_args
 
 def install(swiftpm_bin_path, toolchain):