Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6404)

Unified Diff: build/config/mac/sdk_info.py

Issue 1993653002: [GN] Use "xcrun" instead of "xcodebuild" to get information on SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-gn-check-ios
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c343aa1bd1dd93a0962d489d3213b758f71fed9d 100644
--- a/build/config/mac/sdk_info.py
+++ b/build/config/mac/sdk_info.py
@@ -35,11 +35,12 @@ def FillMachineOSBuild(settings):
def FillSDKPathAndVersion(settings, platform):
"""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()
+ settings['sdk_build'] = subprocess.check_output([
+ 'xcrun', '-sdk', platform, '--show-sdk-build-version']).strip()
Nico 2016/05/18 11:21:06 Hm, my xcrun doesn't know --show-sdk-build-version
sdefresne 2016/05/18 14:45:02 I don't know why gyp does not use it, but when I b
if __name__ == '__main__':
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698