Remove contentious wokrarounds

Author: johnno1962

CoreFoundation/PlugIn.subproj/CFBundle_Main.c

@@ -79,20 +79,12 @@ 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,11 +440,7 @@ 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;

Foundation/Bundle.swift

@@ -53,15 +53,9 @@ open class Bundle: NSObject {
         self.init(path: url.path)
     }
 
-#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()