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

Unified Diff: build/gyp_chromium

Issue 126073005: GN: Autodetect Visual Studio versions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 2fc59f736b67b99ce0c0b7668d79605b9428ce40..1b9328cafc431663af505d68c6c8f39774efb302 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -177,6 +177,15 @@ def GetArgsStringForGN(supplemental_files):
if v in vars_dict:
gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v])
+ # Some other flags come from GYP environment variables.
+ gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION', '')
+ if gyp_msvs_version:
+ gn_args += ' visual_studio_version=' + EscapeStringForGN(gyp_msvs_version)
+ gyp_msvs_override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH', '')
+ if gyp_msvs_override_path:
+ gn_args += ' visual_studio_override_path=' + \
ncarter (slow) 2014/01/09 00:57:18 I think this just needs to be visual_studio_path (
+ EscapeStringForGN(gyp_msvs_override_path)
+
# Set the GYP flag so BUILD files know they're being invoked in GYP mode.
gn_args += ' is_gyp=true'
return gn_args.strip()

Powered by Google App Engine
This is Rietveld 408576698