diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 16:24:29 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 16:24:29 +0000 |
| commit | 1660bffd6b65401778e0657c1fcd658d06097409 (patch) | |
| tree | 14a2718189e36416f9265579a3802b213cc35c33 /build | |
| parent | 75c8ff7442b58012b24265fc76668fb04b475bae (diff) | |
| download | chromium_src-1660bffd6b65401778e0657c1fcd658d06097409.zip chromium_src-1660bffd6b65401778e0657c1fcd658d06097409.tar.gz chromium_src-1660bffd6b65401778e0657c1fcd658d06097409.tar.bz2 | |
Consolidate google chrome build flag for grit targets.
Just moving a bunch of duplicated gyp logic into
build/common.gypi.
Review URL: http://codereview.chromium.org/6724007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index da67502..955ff11 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -489,6 +489,13 @@ }], # Setup -D flags passed into grit. + ['branding=="Chrome"', { + # TODO(mmoss) The .grd files look for _google_chrome, but for + # consistency they should look for google_chrome_build like C++. + 'grit_defines': ['-D', '_google_chrome'], + }, { + 'grit_defines': ['-D', '_chromium'], + }], ['chromeos==1', { 'grit_defines': ['-D', 'chromeos'], }], |