android: add Android to list of possible target OSes, stdlib now compiles

Author: zhuowei

lib/Basic/LangOptions.cpp

@@ -28,7 +28,8 @@ const std::vector<std::string> LangOptions::SupportedOSBuildConfigArguments = {
   "tvOS",
   "watchOS",
   "iOS",
-  "Linux"
+  "Linux",
+  "Android"
 };
 
 const std::vector<std::string> LangOptions::SupportedArchBuildConfigArguments = {
@@ -96,6 +97,8 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     addTargetConfigOption("os", "watchOS");
   else if (triple.isiOS())
     addTargetConfigOption("os", "iOS");
+  else if (triple.isAndroid())
+    addTargetConfigOption("os", "Android");
   else if (triple.isOSLinux())
     addTargetConfigOption("os", "Linux");
   else {

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -40,7 +40,7 @@ import SwiftPrivate
 import SwiftPrivatePthreadExtras
 #if os(OSX) || os(iOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -14,7 +14,7 @@ import SwiftPrivate
 import SwiftPrivateDarwinExtras
 #if os(OSX) || os(iOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -16,7 +16,7 @@ import SwiftPrivateDarwinExtras
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 
@@ -985,6 +985,7 @@ public enum OSVersion : CustomStringConvertible {
   case TVOSSimulator
   case watchOSSimulator
   case Linux
+  case Android
 
   public var description: String {
     switch self {
@@ -1004,6 +1005,8 @@ public enum OSVersion : CustomStringConvertible {
       return "watchOSSimulator"
     case Linux:
       return "Linux"
+    case Android:
+      return "Android"
     }
   }
 }
@@ -1036,6 +1039,8 @@ func _getOSVersion() -> OSVersion {
   return .watchOSSimulator
 #elseif os(Linux)
   return .Linux
+#elseif os(Android)
+  return .Android
 #else
   let productName = _stdlib_getSystemVersionPlistProperty("ProductName")!
   let productVersion = _stdlib_getSystemVersionPlistProperty("ProductVersion")!
@@ -1106,6 +1111,7 @@ public enum TestRunPredicate : CustomStringConvertible {
   case watchOSSimulatorAny(/*reason:*/ String)
 
   case LinuxAny(reason: String)
+  case AndroidAny(reason: String)
 
   public var description: String {
     switch self {
@@ -1174,6 +1180,9 @@ public enum TestRunPredicate : CustomStringConvertible {
 
     case LinuxAny(reason: let reason):
       return "LinuxAny(*, reason: \(reason))"
+
+    case AndroidAny(reason: let reason):
+      return "AndroidAny(*, reason: \(reason))"
     }
   }
 
@@ -1405,6 +1414,14 @@ public enum TestRunPredicate : CustomStringConvertible {
       default:
         return false
       }
+
+    case AndroidAny:
+      switch _getRunningOSVersion() {
+      case .Android:
+        return true
+      default:
+        return false
+      }
     }
   }
 }

stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift

@@ -13,10 +13,12 @@
 import SwiftPrivate
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 
+#if !os(Android)
+
 // swift_posix_spawn isn't available in the public watchOS SDK, we sneak by the
 // unavailable attribute declaration here of the APIs that we need.
 
@@ -47,6 +49,8 @@ func swift_posix_spawn(
   _ argv: UnsafePointer<UnsafeMutablePointer<Int8>>,
   _ envp: UnsafePointer<UnsafeMutablePointer<Int8>>) -> CInt
 
+#endif
+
 /// Calls POSIX `pipe()`.
 func posixPipe() -> (readFD: CInt, writeFD: CInt) {
   var fds: [CInt] = [ -1, -1 ]
@@ -64,6 +68,9 @@ func posixPipe() -> (readFD: CInt, writeFD: CInt) {
 /// stderr.
 public func spawnChild(args: [String])
   -> (pid: pid_t, stdinFD: CInt, stdoutFD: CInt, stderrFD: CInt) {
+#if os(Android)
+  preconditionFailure("posix_spawn doesn't exist on Android")
+#else
   var fileActions = posix_spawn_file_actions_t()
   if swift_posix_spawn_file_actions_init(&fileActions) != 0 {
     preconditionFailure("swift_posix_spawn_file_actions_init() failed")
@@ -138,6 +145,7 @@ public func spawnChild(args: [String])
   }
 
   return (pid, childStdin.writeFD, childStdout.readFD, childStderr.readFD)
+#endif
 }
 
 internal func _readAll(fd: CInt) -> String {
@@ -232,6 +240,8 @@ func _NSGetEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<UnsafeMutableP
 internal func _getEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<CChar>> {
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
   return _NSGetEnviron().memory
+#elseif os(Android)
+  return environ
 #else
   return __environ
 #endif

stdlib/private/SwiftPrivateDarwinExtras/SwiftPrivateDarwinExtras.swift

@@ -13,11 +13,14 @@
 import SwiftPrivate
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 
 public func _stdlib_mkstemps(inout template: String, _ suffixlen: CInt) -> CInt {
+#if os(Android)
+  preconditionFailure("mkstemps doesn't work on Android")
+#else
   var utf8 = template.nulTerminatedUTF8
   let (fd, fileName) = utf8.withUnsafeMutableBufferPointer {
     (utf8) -> (CInt, String) in
@@ -27,6 +30,7 @@ public func _stdlib_mkstemps(inout template: String, _ suffixlen: CInt) -> CInt
   }
   template = fileName
   return fd
+#endif
 }
 
 public var _stdlib_FD_SETSIZE: CInt {

stdlib/private/SwiftPrivatePthreadExtras/PthreadBarriers.swift

@@ -12,7 +12,7 @@
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 

stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift

@@ -17,7 +17,7 @@
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 import Glibc
 #endif
 

stdlib/public/Bionic/Glibc.swift

@@ -18,10 +18,10 @@
 
 public var errno: Int32 {
   get {
-    return __errno_location().memory
+    return __errno().memory
   }
   set(val) {
-    return __errno_location().memory = val
+    return __errno().memory = val
   }
 }
 
@@ -61,7 +61,7 @@ public var S_ISVTX: mode_t  { return mode_t(0o001000) }
 // signal.h
 //===----------------------------------------------------------------------===//
 
-#if os(Linux)
+#if os(Android)
 public var SIG_DFL: __sighandler_t? { return nil }
 public var SIG_IGN: __sighandler_t {
   return unsafeBitCast(1, __sighandler_t.self)

stdlib/public/Bionic/module.map

@@ -345,10 +345,10 @@ module SwiftBionic [system] {
       header "SYSROOT/usr/include/termios.h"
       export *
     }
-    module ulimit {
-      header "SYSROOT/usr/include/ulimit.h"
-      export *
-    }
+    //module ulimit {
+    //  header "SYSROOT/usr/include/ulimit.h"
+    //  export *
+    //}
     module unistd {
       header "SYSROOT/usr/include/unistd.h"
       export *
@@ -361,10 +361,10 @@ module SwiftBionic [system] {
     //  header "SYSROOT/usr/include/utmpx.h"
     //  export *
     //}
-    module wait {
-      header "SYSROOT/usr/include/wait.h"
-      export *
-    }
+    //module wait {
+    //  header "SYSROOT/usr/include/wait.h"
+    //  export *
+    //}
     //module wordexp {
     //  header "SYSROOT/usr/include/wordexp.h"
     //  export *