Bug 1429819: Allow using tooltool macOS SDK on all automation builds and all cross-builds. draft
authorTom Prince <mozilla@hocat.ca>
Tue, 23 Jan 2018 11:56:50 -0700
changeset 723805 5f72ed81bbc6c026d0ad5a9d5ec2f77a9d23341e
parent 723720 94057f351ba94b31e1b5a56fefdfe9d8e43d0e5d
child 746955 5ba7280060ca600e4de31ec2f3eef9cb0b043ccf
push id96535
push userbmo:mozilla@hocat.ca
push dateTue, 23 Jan 2018 20:54:36 +0000
bugs1429819
milestone60.0a1
Bug 1429819: Allow using tooltool macOS SDK on all automation builds and all cross-builds. The original logic I wrote had the condition backwards. MozReview-Commit-ID: IFIS8vZLgd4
media/webrtc/trunk/build/mac/find_sdk.py
--- a/media/webrtc/trunk/build/mac/find_sdk.py
+++ b/media/webrtc/trunk/build/mac/find_sdk.py
@@ -79,17 +79,17 @@ def main():
   if options.print_sdk_path:
     print subprocess.check_output(
         ['xcrun', '-sdk', 'macosx' + best_sdk, '--show-sdk-path']).strip()
 
   return best_sdk
 
 
 if __name__ == '__main__':
-  if sys.platform == 'darwin' or os.environ.get('MOZ_AUTOMATION') != '1':
+  if sys.platform == 'darwin' and os.environ.get('MOZ_AUTOMATION') != '1':
     print main()
   else:
     # Mozilla builds cross-compile on Linux or install an SDK from tooltool, so
     # return some fake data to keep the build system happy. These values aren't
     # used anywhere.
     print "."
     print "."
   sys.exit(0)