Changes required for swift-4.1-branch port to Android

Author: johnno1962

CoreFoundation/Base.subproj/CFBase.h

@@ -448,6 +448,12 @@ CF_EXPORT double kCFCoreFoundationVersionNumber;
 #define kCFCoreFoundationVersionNumber_iOS_9_x_Max 1299
 #endif
 
+#ifdef __ANDROID__
+typedef uint16_t _swift_rc_type;
+#else
+typedef uint32_t _swift_rc_type;
+#endif
+
 #if __LLP64__
 typedef unsigned long long CFTypeID;
 typedef unsigned long long CFOptionFlags;

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__ || defined(__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());
+#ifdef __ANDROID__
+#define pw_gecos pw_name
+#endif
     if (upwd && upwd->pw_gecos) {
         result = CFStringCreateWithCString(kCFAllocatorSystemDefault, upwd->pw_gecos, kCFPlatformInterfaceStringEncoding);
     }

CoreFoundation/Base.subproj/CFRuntime.h

@@ -193,8 +193,8 @@ CF_EXPORT void _CFRuntimeUnregisterClassWithTypeID(CFTypeID typeID);
 typedef struct __CFRuntimeBase {
     // This matches the isa and retain count storage in Swift
     uintptr_t _cfisa;
-    uint32_t _swift_strong_rc;
-    uint32_t _swift_weak_rc;
+    _swift_rc_type _swift_strong_rc;
+    _swift_rc_type _swift_weak_rc;
     // This is for CF's use, and must match _NSCFType layout
     _Atomic(uint64_t) _cfinfoa;
 } CFRuntimeBase;

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);
+#elseif defined(__ANDROID__)
+    return strlen(entry->d_name);
 #else
     return entry->d_namlen;
 #endif

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 && !defined(__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;
+#ifdef __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
+#ifdef __ANDROID__
+    CFURLRef prefDir = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+#else
     CFURLRef prefDir = _preferencesDirectoryForUserHostSafetyLevel(userName, hostName, safeLevel);
+#endif
     CFStringRef  appName;
     CFStringRef  fileName;
     Boolean mustFreeAppName = false;

CoreFoundation/String.subproj/CFString.h

@@ -155,8 +155,8 @@ since it is the default choice with Mac OS X developer tools.
 struct __CFConstStr {
     struct {
         uintptr_t _cfisa;
-        uint32_t _swift_strong_rc;
-        uint32_t _swift_weak_rc;
+        _swift_rc_type _swift_strong_rc;
+        _swift_rc_type _swift_weak_rc;
         uint64_t _cfinfoa;
     } _base;
     uint8_t *_ptr;