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

Unified Diff: build/isolate.gypi

Issue 1891763002: isolate.gypi: Only load build/util/version.gypi for Windows. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/isolate.gypi
diff --git a/build/isolate.gypi b/build/isolate.gypi
index fc82a15cbd939bb56b9b469bbde544c2110f5e2a..ea3a91bdee057db68e43e8e9dcdf9c148e792c3d 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -37,9 +37,6 @@
# for more information.
{
- 'includes': [
- '../build/util/version.gypi',
- ],
'rules': [
{
'rule_name': 'isolate',
@@ -67,10 +64,6 @@
'--path-variable', 'DEPTH', '<(DEPTH)',
'--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
- # Extra variables are replaced on the 'command' entry and on paths in
- # the .isolate file but are not considered relative paths.
- '--extra-variable', 'version_full=<(version_full)',
-
# Note: This list must match DefaultConfigVariables()
# in build/android/pylib/utils/isolator.py
'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',
@@ -104,6 +97,8 @@
],
'conditions': [
# Note: When gyp merges lists, it appends them to the old value.
+ # Extra variables are replaced on the 'command' entry and on paths in
+ # the .isolate file but are not considered relative paths.
['OS=="mac"', {
'action': [
'--extra-variable', 'mac_product_name=<(mac_product_name)',
@@ -119,7 +114,9 @@
],
}],
['OS=="win"', {
+ 'includes': ['../build/util/version.gypi'],
'action': [
+ '--extra-variable', 'version_full=<(version_full)',
'--config-variable', 'msvs_version=<(MSVS_VERSION)',
],
}, {
« 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