CONST_STRING_DECL() problem resolved

Author: johnno1962

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__)

CoreFoundation/Base.subproj/CFUtilities.c

@@ -769,7 +769,7 @@ void CFLog(CFLogLevel lev, CFStringRef format, ...) {
 void CFLog1(CFLogLevel lev, CFStringRef message) {
 #ifdef __ANDROID__
     android_LogPriority priority = ANDROID_LOG_UNKNOWN;
-    switch ( lev ) {
+    switch (lev) {
         case kCFLogLevelEmergency: priority = ANDROID_LOG_FATAL; break;
         case kCFLogLevelAlert: priority = ANDROID_LOG_ERROR; break;
         case kCFLogLevelCritical: priority = ANDROID_LOG_ERROR; break;
@@ -781,10 +781,13 @@ void CFLog1(CFLogLevel lev, CFStringRef message) {
     }
     CFIndex blen = message ? CFStringGetMaximumSizeForEncoding(CFStringGetLength(message), kCFStringEncodingUTF8) + 1 : 0;
     char *buf = message ? (char *)malloc(blen) : 0;
-    if ( buf ) {
-        CFStringGetCString(message, buf, blen, kCFStringEncodingUTF8);
+    if (buf) {
+        if (blen == 1)
+            buf[0] = '\000';
+        else
+            CFStringGetCString(message, buf, blen, kCFStringEncodingUTF8);
         __android_log_print(priority, "Swift", "%s", buf);
-        free( buf );
+        free(buf);
     }
 #else
     CFLog(lev, CFSTR("%@"), message);

CoreFoundation/String.subproj/CFString.c

@@ -1264,16 +1264,12 @@ CF_PRIVATE CFStringRef __CFStringCreateImmutableFunnel3(
 	contentsDeallocator = __CFGetDefaultAllocator();
     }
 
-    #ifndef __ANDROID__
-    // https://bugs.swift.org/browse/SR-2587
-    // crashes String.swift, line 51 when creating String from zero length Data
     if ((NULL != kCFEmptyString) && (numBytes == 0) && _CFAllocatorIsSystemDefault(alloc)) {	// If we are using the system default allocator, and the string is empty, then use the empty string!
 	if (noCopy && (contentsDeallocator != kCFAllocatorNull)) {	// See 2365208... This change was done after Sonata; before we didn't free the bytes at all (leak).
 	    CFAllocatorDeallocate(contentsDeallocator, (void *)bytes); 
 	}
 	return (CFStringRef)CFRetain(kCFEmptyString);	// Quick exit; won't catch all empty strings, but most
     }
-    #endif
 
     // At this point, contentsDeallocator is either same as alloc, or kCFAllocatorNull, or something else, but not NULL
 

Foundation/NSURLSession/NSURLSessionTask.swift

@@ -630,12 +630,9 @@ fileprivate extension URLSessionTask {
         var result = [("Connection", "keep-alive"),
                       ("User-Agent", userAgentString),
                       ]
-        #if !os(Android)
-        // Crashes on Android https://bugs.swift.org/browse/SR-2588
         if let language = NSLocale.current.languageCode {
             result.append(("Accept-Language", language))
         }
-        #endif
         return result
     }
     /// Any header values that should be removed from the ones set by libcurl

android/package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# prepare binay package used to build Foundtion for Android
+# Prepare binary package used to build Foundation for Android
 #
 
 cd "$(dirname $0)" &&