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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 113974: Fix branded resource buiding.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | tools/grit/grit/tool/build.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 16995)
+++ chrome/chrome.gyp (working copy)
@@ -70,8 +70,10 @@
# consistency they should look for GOOGLE_CHROME_BUILD like C++.
# Clean this up when Windows moves to gyp.
'chrome_build': '_google_chrome',
+ 'branded_env': 'CHROMIUM_BUILD=google_chrome',
}, { # else: branding!="Chrome"
'chrome_build': '_chromium',
+ 'branded_env': 'CHROMIUM_BUILD=chromium',
}],
],
},
@@ -84,7 +86,9 @@
],
'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
- '-D', '<(chrome_build)'],
+ '-D', '<(chrome_build)',
+ '-E', '<(branded_env)',
+ ],
'message': 'Generating resources from <(RULE_INPUT_PATH)',
},
],
« no previous file with comments | « no previous file | tools/grit/grit/tool/build.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698