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

build/config/mac/sdk_info.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import subprocess
 import sys
 
 # This script prints information about the build system, the operating
 # system and the iOS or Mac SDK (depending on the platform "iphonesimulator",
@@ skipping 15 matching lines @@
   settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
   settings['xcode_build'] = lines[-1].split()[-1]
 
 
 def FillMachineOSBuild(settings):
   """Fills OS build number into |settings|."""
   settings['machine_os_build'] = subprocess.check_output(
       ['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__':
   if len(sys.argv) != 2:
     sys.stderr.write(
         'usage: %s [iphoneos|iphonesimulator|macosx]\n' %
         os.path.basename(sys.argv[0]))
     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])