Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f456d47c authored by Al Sutton's avatar Al Sutton
Browse files

Fix building on modern versions of Xcode and OS X. 

Recent versions of XCode fail to compile the adb and fastboot binaries due to
two functions being deprecated in 10.9 (GetCurrentProcess and
ProcessInformationCopyDictionary), and the use of -Werrror.

This patch replaces the method implementations which use calls to methods
deprecated in the 10.9 SDK with versions which only call non-deprecated methods.

Change-Id: I855bf26aff45093ca9022924f3ecd1b80f2305a8
parent 81906d4b

adb/get_my_path_darwin.c

+7 −7
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 


void get_my_path(char *s, size_t maxLen)

{

    ProcessSerialNumber psn;

    GetCurrentProcess(&psn);

    CFDictionaryRef dict;

    dict = ProcessInformationCopyDictionary(&psn, 0xffffffff);

    CFStringRef value = (CFStringRef)CFDictionaryGetValue(dict,

                CFSTR("CFBundleExecutable"));

    CFStringGetCString(value, s, maxLen, kCFStringEncodingUTF8);

    CFBundleRef mainBundle = CFBundleGetMainBundle();

    CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle);

    CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);

    CFRelease(bundleURL);



    CFStringGetCString(bundlePathString, s, maxLen, kCFStringEncodingASCII);

    CFRelease(bundlePathString);

}

fastboot/util_osx.c

+9 −8
Original line number Diff line number Diff line
@@ -31,14 +31,15 @@ 


void get_my_path(char s[PATH_MAX])

{

    CFBundleRef mainBundle = CFBundleGetMainBundle();

    CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle);

    CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);

    CFRelease(bundleURL);



    CFStringGetCString(bundlePathString, s, PATH_MAX - 1, kCFStringEncodingASCII);

    CFRelease(bundlePathString);



	char *x;

    ProcessSerialNumber psn;

    GetCurrentProcess(&psn);

    CFDictionaryRef dict;

    dict = ProcessInformationCopyDictionary(&psn, 0xffffffff);

    CFStringRef value = (CFStringRef)CFDictionaryGetValue(dict,

                CFSTR("CFBundleExecutable"));

    CFStringGetCString(value, s, PATH_MAX - 1, kCFStringEncodingUTF8);

    x = strrchr(s, '/');

    if(x) x[1] = 0;

}