Port of Foundation to Android (#622)

johnno1962 · parkera · commit 16f83ddcd311 · 2016-09-22T16:16:49.000-07:00
* Port of Foundation to Android * Port of Foundation to Android * Missing -lcurl for Linux builds of Foundation * README and script tidy-up * Response to comments * NSGeonetry, Operation queues fixed * More reponses to comments * NSLog now working * Update README * Update README * CGFloat.swift problems resolved, NSGeometry, NSScanner.swift updated * Glibc is already an @_exported import in NSSwiftRuntime.swift * Glibc is already an @_exported import in NSSwiftRuntime.swift * #import <stdarg.h> problem went away with rebuild * Update scripts * move to SEEK_* macros * Better logging and restructuring * CONST_STRING_DECL() problem resolved * Jira for CFStringGetCString() crash with zero length strings * Only use heap if required in logging * Reinstate fix for SR-2666 * Reinstate fix for SR-2666 * Ensure NSUnimplemented() functions logged * one true brace style * Final tweaks?
diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/CoreFoundation/Base.subproj/CFInternal.h
@@ -339,6 +339,16 @@ CF_PRIVATE Boolean __CFProcessIsRestricted();
 #define STACK_BUFFER_DECL(T, N, C) T N[C]
 #endif
 
+#ifdef __ANDROID__
+// Avoids crashes on Android
+// https://bugs.swift.org/browse/SR-2587
+// https://bugs.swift.org/browse/SR-2588
+// Seemed to be a linker/relocation? problem.
+// CFStrings using CONST_STRING_DECL() were not working
+// Applies reference to _NSCFConstantString's isa here
+// rather than using a linker option to create an alias.
+#define __CFConstantStringClassReference _TMC10Foundation19_NSCFConstantString
+#endif
 
 CF_EXPORT void * __CFConstantStringClassReferencePtr;
 #if defined(__CONSTANT_CFSTRINGS__)
diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c
@@ -157,7 +157,11 @@ const char *_CFProcessPath(void) {
 
 #if DEPLOYMENT_TARGET_LINUX
 #include <unistd.h>
+#if __has_include(<syscall.h>)
 #include <syscall.h>
+#else
+#include <sys/syscall.h>
+#endif
 
 Boolean _CFIsMainThread(void) {
     return syscall(SYS_gettid) == getpid();
diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c
@@ -25,6 +25,9 @@
 #if DEPLOYMENT_TARGET_WINDOWS
 #include <process.h>
 #endif
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
@@ -764,7 +767,45 @@ void CFLog(CFLogLevel lev, CFStringRef format, ...) {
 #if DEPLOYMENT_RUNTIME_SWIFT
 // Temporary as Swift cannot import varag C functions
 void CFLog1(CFLogLevel lev, CFStringRef message) {
+#ifdef __ANDROID__
+    android_LogPriority priority = ANDROID_LOG_UNKNOWN;
+    switch (lev) {
+        case kCFLogLevelEmergency: priority = ANDROID_LOG_FATAL; break;
+        case kCFLogLevelAlert:     priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelCritical:  priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelError:     priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelWarning:   priority = ANDROID_LOG_WARN;  break;
+        case kCFLogLevelNotice:    priority = ANDROID_LOG_WARN;  break;
+        case kCFLogLevelInfo:      priority = ANDROID_LOG_INFO;  break;
+        case kCFLogLevelDebug:     priority = ANDROID_LOG_DEBUG; break;
+    }
+
+    if (message == NULL) message = CFSTR("NULL");
+
+    char stack_buffer[1024] = { 0 };
+    char *buffer = &stack_buffer[0];
+    CFStringEncoding encoding = kCFStringEncodingUTF8;
+    CFIndex maxLength = CFStringGetMaximumSizeForEncoding(CFStringGetLength(message), encoding) + 1;
+
+    if (maxLength > sizeof(stack_buffer) / sizeof(stack_buffer[0])) {
+        buffer = calloc(sizeof(char), maxLength);
+    }
+
+    if (maxLength == 1) {
+        // was crashing with zero length strings
+        // https://bugs.swift.org/browse/SR-2666
+        strcpy(buffer, " "); // log empty string
+    }
+    else
+        CFStringGetCString(message, buffer, maxLength, encoding);
+
+    const char *tag = "Swift"; // process name not available from NDK
+    __android_log_print(priority, tag, "%s", buffer);
+
+    if (buffer != &stack_buffer[0]) free(buffer);
+#else
     CFLog(lev, CFSTR("%@"), message);
+#endif
 }
 #endif
 
@@ -1265,7 +1306,7 @@ CFDictionaryRef __CFGetEnvironment() {
         extern char **environ;
         char **envp = environ;
 #elif DEPLOYMENT_TARGET_LINUX
-#ifndef environ
+#if !defined(environ) && !defined(__ANDROID__)
 #define environ __environ
 #endif
         char **envp = environ;
diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
@@ -178,6 +178,11 @@ typedef int		boolean_t;
 
 #include <pthread.h>
 
+#ifdef __ANDROID__
+typedef unsigned long fd_mask;
+#endif
+
+#ifndef __ANDROID__
 CF_INLINE size_t
 strlcpy(char * dst, const char * src, size_t maxlen) {
     const size_t srclen = strlen(src);
@@ -203,6 +208,7 @@ strlcat(char * dst, const char * src, size_t maxlen) {
     }
     return dstlen + srclen;
 }
+#endif
 
 #define issetugid() 0
     
diff --git a/CoreFoundation/Base.subproj/SwiftRuntime/CoreFoundation.h b/CoreFoundation/Base.subproj/SwiftRuntime/CoreFoundation.h
@@ -39,6 +39,10 @@
 #include <string.h>
 #include <time.h>
 
+#if __has_include(<netdb.h>)
+#include <netdb.h> // for NSHost.swift
+#endif
+
 #if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__)
 
 #include <inttypes.h>
diff --git a/CoreFoundation/NumberDate.subproj/CFTimeZone.c b/CoreFoundation/NumberDate.subproj/CFTimeZone.c
@@ -32,7 +32,11 @@
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 #include <dirent.h>
 #include <unistd.h>
+#if __has_include(<sys/fcntl.h>)
 #include <sys/fcntl.h>
+#else
+#include <fcntl.h>
+#endif
 #endif
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
 #include <tzfile.h>
diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c b/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c
@@ -25,7 +25,9 @@
 
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_FREEBSD
 #include <dirent.h>
+#if __has_include(<sys/sysctl.h>)
 #include <sys/sysctl.h>
+#endif
 #include <sys/mman.h>
 #endif
 
diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c b/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c
@@ -33,7 +33,9 @@
 
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
 #include <unistd.h>
+#if __has_include(<sys/sysctl.h>)
 #include <sys/sysctl.h>
+#endif
 #include <sys/stat.h>
 #include <dirent.h>
 #endif
diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c
@@ -30,7 +30,11 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#if __has_include(<sys/syslog.h>)
 #include <sys/syslog.h>
+#else
+#include <syslog.h>
+#endif
 #include <CoreFoundation/CFURLPriv.h>
 #endif
 
diff --git a/Foundation/NSData.swift b/Foundation/NSData.swift
@@ -423,7 +423,7 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
             repeat {
                 #if os(OSX) || os(iOS)
                     bytesWritten = Darwin.write(fd, buf.advanced(by: length - bytesRemaining), bytesRemaining)
-                #elseif os(Linux)
+                #elseif os(Linux) || os(Android)
                     bytesWritten = Glibc.write(fd, buf.advanced(by: length - bytesRemaining), bytesRemaining)
                 #endif
             } while (bytesWritten < 0 && errno == EINTR)
@@ -444,7 +444,7 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
             // Preserve permissions.
             var info = stat()
             if lstat(path, &info) == 0 {
-                mode = info.st_mode
+                mode = mode_t(info.st_mode)
             } else if errno != ENOENT && errno != ENAMETOOLONG {
                 throw _NSErrorWithErrno(errno, reading: false, path: path)
             }
diff --git a/Foundation/NSFileHandle.swift b/Foundation/NSFileHandle.swift
@@ -71,11 +71,11 @@ open class FileHandle : NSObject, NSSecureCoding {
                 }
             }
         } else {
-            let offset = lseek(_fd, 0, L_INCR)
+            let offset = lseek(_fd, 0, SEEK_CUR)
             if offset < 0 {
                 fatalError("Unable to fetch current file offset")
             }
-            if statbuf.st_size > offset {
+            if off_t(statbuf.st_size) > offset {
                 var remaining = size_t(statbuf.st_size - offset)
                 remaining = min(remaining, size_t(length))
                 
@@ -128,19 +128,19 @@ open class FileHandle : NSObject, NSSecureCoding {
     // TODO: Error handling.
     
     open var offsetInFile: UInt64 {
-        return UInt64(lseek(_fd, 0, L_INCR))
+        return UInt64(lseek(_fd, 0, SEEK_CUR))
     }
     
     open func seekToEndOfFile() -> UInt64 {
-        return UInt64(lseek(_fd, 0, L_XTND))
+        return UInt64(lseek(_fd, 0, SEEK_END))
     }
     
     open func seek(toFileOffset offset: UInt64) {
-        lseek(_fd, off_t(offset), L_SET)
+        lseek(_fd, off_t(offset), SEEK_SET)
     }
     
     open func truncateFile(atOffset offset: UInt64) {
-        if lseek(_fd, off_t(offset), L_SET) == 0 {
+        if lseek(_fd, off_t(offset), SEEK_SET) == 0 {
             ftruncate(_fd, off_t(offset))
         }
     }
diff --git a/Foundation/NSFileManager.swift b/Foundation/NSFileManager.swift
@@ -13,6 +13,12 @@
     import Glibc
 #endif
 
+#if os(Android) // struct stat.st_mode is UInt32
+internal func &(left: UInt32, right: mode_t) -> mode_t {
+    return mode_t(left) & right
+}
+#endif
+
 import CoreFoundation
 
 open class FileManager : NSObject {
@@ -123,10 +129,10 @@ open class FileManager : NSObject {
                 }
                 #if os(OSX) || os(iOS)
                     let modeT = number.uint16Value
-                #elseif os(Linux)
+                #elseif os(Linux) || os(Android)
                     let modeT = number.uint32Value
                 #endif
-                if chmod(path, modeT) != 0 {
+                if chmod(path, mode_t(modeT)) != 0 {
                     fatalError("errno \(errno)")
                 }
             } else {
@@ -246,11 +252,11 @@ open class FileManager : NSObject {
                 }
                 #if os(OSX) || os(iOS)
                     let tempEntryType = entryType
-                #elseif os(Linux)
+                #elseif os(Linux) || os(Android)
                     let tempEntryType = Int(entryType)
                 #endif
                         
-                if tempEntryType == DT_DIR {
+                if tempEntryType == Int(DT_DIR) {
                     let subPath: String = path + "/" + entryName
                             
                     let entries =  try subpathsOfDirectory(atPath: subPath)
@@ -279,6 +285,8 @@ open class FileManager : NSObject {
 
 #if os(OSX) || os(iOS)
         let ti = (TimeInterval(s.st_mtimespec.tv_sec) - kCFAbsoluteTimeIntervalSince1970) + (1.0e-9 * TimeInterval(s.st_mtimespec.tv_nsec))
+#elseif os(Android)
+        let ti = (TimeInterval(s.st_mtime) - kCFAbsoluteTimeIntervalSince1970) + (1.0e-9 * TimeInterval(s.st_mtime_nsec))
 #else
         let ti = (TimeInterval(s.st_mtim.tv_sec) - kCFAbsoluteTimeIntervalSince1970) + (1.0e-9 * TimeInterval(s.st_mtim.tv_nsec))
 #endif
@@ -361,7 +369,7 @@ open class FileManager : NSObject {
             throw _NSErrorWithErrno(errno, reading: true, path: path)
         }
         
-        return self.string(withFileSystemRepresentation: buf, length: len)
+        return self.string(withFileSystemRepresentation: buf, length: Int(len))
     }
     
     open func copyItem(atPath srcPath: String, toPath dstPath: String) throws {
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -18,7 +18,7 @@ open class NSLocale: NSObject, NSCopying, NSSecureCoding {
     private var _prefs: UnsafeMutableRawPointer? = nil
 #if os(OSX) || os(iOS)
     private var _lock = pthread_mutex_t()
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
     private var _lock = Int32(0)
 #endif
     private var _nullLocale = false
diff --git a/Foundation/NSObjCRuntime.swift b/Foundation/NSObjCRuntime.swift
@@ -196,6 +196,9 @@ internal func NSRequiresConcreteImplementation(_ fn: String = #function, file: S
 }
 
 internal func NSUnimplemented(_ fn: String = #function, file: StaticString = #file, line: UInt = #line) -> Never {
+    #if os(Android)
+    NSLog("\(fn) is not yet implemented. \(file):\(line)")
+    #endif
     fatalError("\(fn) is not yet implemented", file: file, line: line)
 }
 
diff --git a/Foundation/NSOperation.swift b/Foundation/NSOperation.swift
@@ -9,7 +9,7 @@
 
 #if DEPLOYMENT_ENABLE_LIBDISPATCH
 import Dispatch
-#if os(Linux)
+#if os(Linux) || os(Android)
 import CoreFoundation
 private func pthread_main_np() -> Int32 {
     return _CFIsMainThread() ? 1 : 0
diff --git a/Foundation/NSSwiftRuntime.swift b/Foundation/NSSwiftRuntime.swift
@@ -14,10 +14,16 @@ import CoreFoundation
 // This mimics the behavior of the swift sdk overlay on Darwin
 #if os(OSX) || os(iOS)
 @_exported import Darwin
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 @_exported import Glibc
 #endif
 
+#if os(Android) // shim required for bzero
+@_transparent func bzero(_ ptr: UnsafeMutableRawPointer, _ size: size_t) {
+    memset(ptr, 0, size)
+}
+#endif
+
 public typealias ObjCBool = Bool
 
 internal class __NSCFType : NSObject {
diff --git a/Foundation/NSTask.swift b/Foundation/NSTask.swift
@@ -7,6 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if !os(Android) // not available
 import CoreFoundation
 
 #if os(OSX) || os(iOS)
@@ -455,3 +456,4 @@ private func posix(_ code: Int32) {
     default: fatalError("POSIX command failed with error: \(code)")
     }
 }
+#endif
diff --git a/Foundation/NSThread.swift b/Foundation/NSThread.swift
@@ -133,7 +133,7 @@ open class Thread : NSObject {
     internal var _main: (Void) -> Void = {}
 #if os(OSX) || os(iOS)
     private var _thread: pthread_t? = nil
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
     private var _thread = pthread_t()
 #endif
     internal var _attr = pthread_attr_t()
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
@@ -496,7 +496,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
     
     open var password: String? {
         let absoluteURL = CFURLCopyAbsoluteURL(_cfObject)
-#if os(Linux)
+#if os(Linux) || os(Android)
         let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, kCFURLComponentPassword, nil)
 #else
         let passwordRange = CFURLGetByteRangeForComponent(absoluteURL, .password, nil)
diff --git a/Foundation/NSXMLNode.swift b/Foundation/NSXMLNode.swift
@@ -83,7 +83,7 @@ open class XMLNode: NSObject, NSCopying {
         public static let nodePromoteSignificantWhitespace = Options(rawValue: 1 << 28)
         public static let nodePreserveEmptyElements = Options([.nodeExpandEmptyElement, .nodeCompactEmptyElement])
         public static let nodePreserveQuotes = Options([.nodeUseSingleQuotes, .nodeUseDoubleQuotes])
-        public static let nodePreserveAll = Options(rawValue: Options([.nodePreserveNamespaceOrder, .nodePreserveAttributeOrder, .nodePreserveEntities, .nodePreservePrefixes, .nodePreserveCDATA, .nodePreserveEmptyElements, .nodePreserveQuotes, .nodePreserveWhitespace, .nodePreserveDTD, .nodePreserveCharacterReferences]).rawValue | UInt(bitPattern: 0xFFF00000))
+        public static let nodePreserveAll = Options(rawValue: 0xFFF00000).union([.nodePreserveNamespaceOrder, .nodePreserveAttributeOrder, .nodePreserveEntities, .nodePreservePrefixes, .nodePreserveCDATA, .nodePreserveEmptyElements, .nodePreserveQuotes, .nodePreserveWhitespace, .nodePreserveDTD, .nodePreserveCharacterReferences])
     }
 
     open override func copy() -> Any {
diff --git a/android/README.md b/android/README.md
diff --git a/android/builder.sh b/android/builder.sh
diff --git a/android/install.sh b/android/install.sh
diff --git a/android/package.sh b/android/package.sh
diff --git a/android/prepare.sh b/android/prepare.sh
diff --git a/android/updater.sh b/android/updater.sh
diff --git a/build.py b/build.py
diff --git a/lib/target.py b/lib/target.py
