In response to review comments

johnno1962 · johnno1962 · commit ec4456edd667 · 2018-04-18T09:07:28.000+01:00
diff --git a/CoreFoundation/Base.subproj/CFBase.h b/CoreFoundation/Base.subproj/CFBase.h
@@ -449,9 +449,9 @@ CF_EXPORT double kCFCoreFoundationVersionNumber;
 #endif
 
 #ifdef __ANDROID__
-typedef uint16_t _swift_rc_type;
+typedef uint16_t _CFSwiftRCCount;
 #else
-typedef uint32_t _swift_rc_type;
+typedef uint32_t _CFSwiftRCCount;
 #endif
 
 #if __LLP64__
diff --git a/CoreFoundation/Base.subproj/CFInternal.h b/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__ || defined(__ANDROID__)
+#if __LP64__ || DEPLOYMENT_TARGET_ANDROID
 typedef uint64_t __CFInfoType;
 #define __CFInfoMask(N1, N2) __CFBitfield64Mask(N1, N2)
 #else
diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c
@@ -297,7 +297,7 @@ CF_EXPORT CFStringRef CFCopyFullUserName(void) {
     uid_t euid;
     __CFGetUGIDs(&euid, NULL);
     struct passwd *upwd = getpwuid(euid ? euid : getuid());
-#ifdef __ANDROID__
+#if DEPLOYMENT_TARGET_ANDROID
 #define pw_gecos pw_name
 #endif
     if (upwd && upwd->pw_gecos) {
diff --git a/CoreFoundation/Base.subproj/CFRuntime.c b/CoreFoundation/Base.subproj/CFRuntime.c
@@ -384,7 +384,11 @@ CFTypeRef _CFRuntimeCreateInstance(CFAllocatorRef allocator, CFTypeID typeID, CF
     CFRuntimeClass *cls = __CFRuntimeClassTable[typeID];
     size_t align = (cls->version & _kCFRuntimeRequiresAlignment) ? cls->requiredAlignment : 16;
     
+#if DEPLOYMENT_TARGET_ANDROID
+    CFRuntimeBase *memory = (CFRuntimeBase *)swift_allocObject(isa, size + 4, align - 1);
+#else
     CFRuntimeBase *memory = (CFRuntimeBase *)swift_allocObject(isa, size, align - 1);
+#endif
     
     // Zero the rest of the memory, starting at cfinfo
     memset(&memory->_cfinfoa, 0, size - (sizeof(memory->_cfisa) + sizeof(memory->_swift_strong_rc) + sizeof(memory->_swift_weak_rc)));
diff --git a/CoreFoundation/Base.subproj/CFRuntime.h b/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;
-    _swift_rc_type _swift_strong_rc;
-    _swift_rc_type _swift_weak_rc;
+    _CFSwiftRCCount _swift_strong_rc;
+    _CFSwiftRCCount _swift_weak_rc;
     // This is for CF's use, and must match _NSCFType layout
     _Atomic(uint64_t) _cfinfoa;
 } CFRuntimeBase;
diff --git a/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h b/CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h
@@ -403,7 +403,7 @@ 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__)
+#elseif DEPLOYMENT_TARGET_ANDROID
     return strlen(entry->d_name);
 #else
     return entry->d_namlen;
diff --git a/CoreFoundation/PlugIn.subproj/CFBundle.c b/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 && !defined(__ANDROID__)
+#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
     bundle->_isFHSInstalledBundle = _CFBundleURLIsForFHSInstalledBundle(newURL);
 #endif
 
diff --git a/CoreFoundation/PlugIn.subproj/CFBundle_Main.c b/CoreFoundation/PlugIn.subproj/CFBundle_Main.c
@@ -79,7 +79,7 @@ static CFBundleRef _CFBundleGetMainBundleAlreadyLocked(void) {
         CFStringRef str = NULL;
         CFURLRef executableURL = NULL, bundleURL = NULL;
         _initedMainBundle = true;
-#ifdef __ANDROID__
+#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,
diff --git a/CoreFoundation/Preferences.subproj/CFPreferences.c b/CoreFoundation/Preferences.subproj/CFPreferences.c
@@ -440,7 +440,7 @@ static CFURLRef _CFPreferencesURLForStandardDomainWithSafetyLevel(CFStringRef do
     CFURLRef theURL = NULL;
     CFAllocatorRef prefAlloc = __CFPreferencesAllocator();
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS
-#ifdef __ANDROID__
+#if DEPLOYMENT_TARGET_ANDROID
     CFURLRef prefDir = CFBundleCopyBundleURL(CFBundleGetMainBundle());
 #else
     CFURLRef prefDir = _preferencesDirectoryForUserHostSafetyLevel(userName, hostName, safeLevel);
diff --git a/CoreFoundation/String.subproj/CFString.h b/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;
-        _swift_rc_type _swift_strong_rc;
-        _swift_rc_type _swift_weak_rc;
+        _CFSwiftRCCount _swift_strong_rc;
+        _CFSwiftRCCount _swift_weak_rc;
         uint64_t _cfinfoa;
     } _base;
     uint8_t *_ptr;
diff --git a/CoreFoundation/URL.subproj/CFURL.c b/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
diff --git a/Foundation/NSCFArray.swift b/Foundation/NSCFArray.swift
@@ -12,9 +12,7 @@ import CoreFoundation
 
 internal final class _NSCFArray : NSMutableArray {
     deinit {
-#if !os(Android)
         _CFDeinit(self)
-#endif
         _CFZeroUnsafeIvars(&_storage)
     }
     
diff --git a/Foundation/NSCFString.swift b/Foundation/NSCFString.swift
@@ -61,8 +61,8 @@ internal final class _NSCFConstantString : _NSCFString {
     internal var _ptr : UnsafePointer<UInt8> {
         // FIXME: Split expression as a work-around for slow type
         //        checking (tracked by SR-5322).
-        let offTemp1 = MemoryLayout<OpaquePointer>.size + MemoryLayout<_swift_rc_type>.size
-        let offTemp2 = MemoryLayout<_swift_rc_type>.size + MemoryLayout<_CFInfo>.size
+        let offTemp1 = MemoryLayout<OpaquePointer>.size + MemoryLayout<_CFSwiftRCCount>.size
+        let offTemp2 = MemoryLayout<_CFSwiftRCCount>.size + MemoryLayout<_CFInfo>.size
         let offset = offTemp1 + offTemp2
         let ptr = Unmanaged.passUnretained(self).toOpaque()
         return ptr.load(fromByteOffset: offset, as: UnsafePointer<UInt8>.self)
@@ -71,8 +71,8 @@ internal final class _NSCFConstantString : _NSCFString {
     private var _lenOffset : Int {
         // FIXME: Split expression as a work-around for slow type
         //        checking (tracked by SR-5322).
-        let offTemp1 = MemoryLayout<OpaquePointer>.size + MemoryLayout<_swift_rc_type>.size
-        let offTemp2 = MemoryLayout<_swift_rc_type>.size + MemoryLayout<_CFInfo>.size
+        let offTemp1 = MemoryLayout<OpaquePointer>.size + MemoryLayout<_CFSwiftRCCount>.size
+        let offTemp2 = MemoryLayout<_CFSwiftRCCount>.size + MemoryLayout<_CFInfo>.size
         return offTemp1 + offTemp2 + MemoryLayout<UnsafePointer<UInt8>>.size
     }
 
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -630,10 +630,6 @@ extension NSString {
     }
 
     public var boolValue: Bool {
-#if os(Android)
-        return (try? NSRegularExpression(pattern: "^[-+]?0*[tTyY123456789]"))?
-            .firstMatch(in: _swiftObject, range: NSMakeRange(0, length)) != nil
-#endif
         let scanner = Scanner(string: _swiftObject)
         // skip initial whitespace if present
         let _ = scanner.scanCharactersFromSet(.whitespaces)
diff --git a/TestFoundation/TestFileManager.swift b/TestFoundation/TestFileManager.swift
@@ -228,9 +228,7 @@ class TestFileManager : XCTestCase {
     }
     
     func test_fileSystemAttributes() {
-#if os(Android)
-        XCTFail("File system attributes not available on Android")
-#else
+#if !os(Android)
         let fm = FileManager.default
         let path = NSTemporaryDirectory()
         
