diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:32:11 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:32:11 +0000 |
| commit | 279cd421c952d1581b4ac9bbc977e5f08b45d3b3 (patch) | |
| tree | 96d68415c866e9d83d8de8465fa364bdcf66634c /build | |
| parent | 1610ac41ee261a0dbe308ef8bd0e53d980609d32 (diff) | |
| download | chromium_src-279cd421c952d1581b4ac9bbc977e5f08b45d3b3.zip chromium_src-279cd421c952d1581b4ac9bbc977e5f08b45d3b3.tar.gz chromium_src-279cd421c952d1581b4ac9bbc977e5f08b45d3b3.tar.bz2 | |
Adding reference to experimental browser distribution files.
Review URL: http://codereview.chromium.org/192076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2026ca6..aeb5d11 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -69,12 +69,12 @@ # {'variables': {'library': 'shared_library'}} # to compile as shared by default 'library%': 'static_library', - + # The Google Update appid. 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', - - # Extra defines to add to built targets - 'extra_custom_defines%': [], + + # Whether to add the experimental build define. + 'experimental_build_define%': 0, # TODO(bradnelson): eliminate this when possible. # To allow local gyp files to prevent release.vsprops from being included. @@ -174,15 +174,15 @@ 'release_extra_cflags%': '', 'debug_extra_cflags%': '', }, - 'defines': [ - '<@(extra_custom_defines)', - ], 'conditions': [ ['branding=="Chrome"', { 'defines': ['GOOGLE_CHROME_BUILD'], }, { # else: branding!="Chrome" 'defines': ['CHROMIUM_BUILD'], }], + ['experimental_build_define', { + 'defines': ['CHROME_EXP_BUILD'], + }], ['toolkit_views==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], |