Changes required for swift-4.1-branch port to Android

Author: johnno1962

CoreFoundation/Base.subproj/CFInternal.h

@@ -216,7 +216,7 @@ extern void __CFGenericValidateType_(CFTypeRef cf, CFTypeID type, const char *fu
 #define __CFBitfield64GetValue(V, N1, N2)	(((V) & __CFBitfield64Mask(N1, N2)) >> (N2))
 #define __CFBitfield64SetValue(V, N1, N2, X)	((V) = ((V) & ~__CFBitfield64Mask(N1, N2)) | ((((uint64_t)X) << (N2)) & __CFBitfield64Mask(N1, N2)))
 
-#if __LP64__
+#if __LP64__ || DEPLOYMENT_TARGET_ANDROID
 typedef uint64_t __CFInfoType;
 #define __CFInfoMask(N1, N2) __CFBitfield64Mask(N1, N2)
 #else

CoreFoundation/Base.subproj/CFPlatform.c

@@ -297,6 +297,9 @@ CF_EXPORT CFStringRef CFCopyFullUserName(void) {
     uid_t euid;
     __CFGetUGIDs(&euid, NULL);
     struct passwd *upwd = getpwuid(euid ? euid : getuid());
+#if DEPLOYMENT_TARGET_ANDROID
+#define pw_gecos pw_name
+#endif
     if (upwd && upwd->pw_gecos) {
         result = CFStringCreateWithCString(kCFAllocatorSystemDefault, upwd->pw_gecos, kCFPlatformInterfaceStringEncoding);
     }

CoreFoundation/Base.subproj/CFUtilities.c

@@ -1000,6 +1000,7 @@ void CFLog1(CFLogLevel lev, CFStringRef message) {
         CFStringGetCString(message, buffer, maxLength, encoding);
 
     __android_log_print(priority, tag, "%s", buffer);
+    fprintf(stderr, "%s\n", buffer);
 
     if (buffer != &stack_buffer[0]) free(buffer);
 #else

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -403,6 +403,8 @@ static inline _Bool _withStackOrHeapBuffer(size_t amount, void (__attribute__((n
 static inline int _direntNameLength(struct dirent *entry) {
 #ifdef _D_EXACT_NAMLEN  // defined on Linux
     return _D_EXACT_NAMLEN(entry);
+#elif DEPLOYMENT_TARGET_ANDROID
+    return strlen(entry->d_name);
 #else
     return entry->d_namlen;
 #endif

CoreFoundation/NumberDate.subproj/CFTimeZone.c

@@ -813,6 +813,15 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
         CFRelease(name);
         if (result) return result;
     }
+#if DEPLOYMENT_TARGET_ANDROID
+    // Timezone database by name not available on Android.
+    // Approximate with gmtoff - could be general default.
+    struct tm info;
+    time_t now = time(NULL);
+    if (NULL != localtime_r(&now, &info)) {
+        return CFTimeZoneCreateWithTimeIntervalFromGMT(kCFAllocatorSystemDefault, info.tm_gmtoff);
+    }
+#endif
     return CFTimeZoneCreateWithTimeIntervalFromGMT(kCFAllocatorSystemDefault, 0.0);
 }
 

CoreFoundation/PlugIn.subproj/CFBundle.c

@@ -714,7 +714,7 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL,
 
     bundle->_url = newURL;
 
-#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS
+#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
     bundle->_isFHSInstalledBundle = _CFBundleURLIsForFHSInstalledBundle(newURL);
 #endif
 

CoreFoundation/PlugIn.subproj/CFBundle_Main.c

@@ -79,12 +79,20 @@ static CFBundleRef _CFBundleGetMainBundleAlreadyLocked(void) {
         CFStringRef str = NULL;
         CFURLRef executableURL = NULL, bundleURL = NULL;
         _initedMainBundle = true;
+#if DEPLOYMENT_TARGET_ANDROID
+        const char *bundlePath = getenv("CFFIXED_USER_HOME") ?: getenv("TMPDIR") ?: "/data/local/tmp";
+        CFStringRef bundleRef = CFStringCreateWithFileSystemRepresentation(kCFAllocatorNull, bundlePath);
+        bundleURL = CFRetain(CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, bundleRef,
+                                                           PLATFORM_PATH_STYLE, false));
+        CFRelease(bundleRef);
+#else
         processPath = _CFProcessPath();
         if (processPath) {
             str = CFStringCreateWithFileSystemRepresentation(kCFAllocatorSystemDefault, processPath);
             if (!executableURL) executableURL = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, str, PLATFORM_PATH_STYLE, false);
         }
         if (executableURL) bundleURL = _CFBundleCopyBundleURLForExecutableURL(executableURL);
+#endif
         if (bundleURL) {
             // make sure that main bundle has executable path
             //??? what if we are not the main executable in the bundle?

CoreFoundation/Preferences.subproj/CFPreferences.c

@@ -440,7 +440,11 @@ static CFURLRef _CFPreferencesURLForStandardDomainWithSafetyLevel(CFStringRef do
     CFURLRef theURL = NULL;
     CFAllocatorRef prefAlloc = __CFPreferencesAllocator();
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_ANDROID
+    CFURLRef prefDir = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+#else
     CFURLRef prefDir = _preferencesDirectoryForUserHostSafetyLevel(userName, hostName, safeLevel);
+#endif
     CFStringRef  appName;
     CFStringRef  fileName;
     Boolean mustFreeAppName = false;

CoreFoundation/URL.subproj/CFURL.c

@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#if __has_include(<sys/syslog.h>)
-#include <sys/syslog.h>
-#elif __has_include(<syslog.h>)
+#if __has_include(<syslog.h>)
 #include <syslog.h>
+#else
+#include <sys/syslog.h>
 #endif
 #include <CoreFoundation/CFURLPriv.h>
 #endif

Foundation/Bundle.swift

@@ -53,8 +53,16 @@ open class Bundle: NSObject {
         self.init(path: url.path)
     }
 
-    public init(for aClass: AnyClass) { NSUnimplemented() }
-    
+#if os(Android)
+    public convenience init(for aClass: AnyClass) {
+        self.init(path: Bundle.main.bundlePath)!
+    }
+#else
+    public init(for aClass: AnyClass) {
+        NSUnimplemented()
+    }
+#endif
+
     public init?(identifier: String) {
         super.init()