[GN] Use "xcrun" instead of "xcodebuild" to get information on SDK.

build/config/mac/sdk_info.py

Index: build/config/mac/sdk_info.py
diff --git a/build/config/mac/sdk_info.py b/build/config/mac/sdk_info.py
index ad4ad9e98975d8b7d38c60696ed9d7fa5305b196..af80b4737ff70cc4de1b753fa07a26b7bd1e836f 100644
--- a/build/config/mac/sdk_info.py
+++ b/build/config/mac/sdk_info.py
@@ -33,13 +33,17 @@ def FillMachineOSBuild(settings):
       ['sw_vers', '-buildVersion']).strip()
 
 
-def FillSDKPathAndVersion(settings, platform):
+def FillSDKPathAndVersion(settings, platform, xcode_version):
   """Fills the SDK path and version for |platform| into |settings|."""
-  lines = subprocess.check_output(['xcodebuild', '-version', '-sdk',
-      platform, 'Path', 'SDKVersion', 'ProductBuildVersion']).splitlines()
-  settings['sdk_path'] = lines[0]
-  settings['sdk_version'] = lines[1]
-  settings['sdk_build'] = lines[2]
+  settings['sdk_path'] = subprocess.check_output([
+      'xcrun', '-sdk', platform, '--show-sdk-path']).strip()
+  settings['sdk_version'] = subprocess.check_output([
+      'xcrun', '-sdk', platform, '--show-sdk-version']).strip()
+  if xcode_version >= '0720':

[Nico, 2016/05/18 18:41:42]

Maybe add an "TODO: unconditionally do this once all bots are on 7.2"

+    settings['sdk_build'] = subprocess.check_output([
+        'xcrun', '-sdk', platform, '--show-sdk-build-version']).strip()
+  else:
+    settings['sdk_build'] = settings['sdk_version']
 
 
 if __name__ == '__main__':
@@ -50,9 +54,9 @@ if __name__ == '__main__':
     sys.exit(1)
 
   settings = {}
-  FillSDKPathAndVersion(settings, sys.argv[1])
   FillMachineOSBuild(settings)
   FillXcodeVersion(settings)
+  FillSDKPathAndVersion(settings, sys.argv[1], settings['xcode_version'])
 
   for key in sorted(settings):
     print '%s="%s"' % (key, settings[key])