diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 01:16:57 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 01:16:57 +0000 |
| commit | fdc5bed00bdcf59f90777142c44eecde407ef23e (patch) | |
| tree | 150f199e6f882943f68c3d3cfbee7ea34f195cda /chrome/chrome.gyp | |
| parent | 7ffe3aae33df556c298680c8754b76578e93c9eb (diff) | |
| download | chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.zip chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.tar.gz chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.tar.bz2 | |
official build and buildbots are now chromeos=1
valgrind bots are up (they're still red tho).
I believe it's ready to check this in.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/487003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6c3c247..61910b5 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -174,7 +174,7 @@ '-E', '<(branded_env)', ], 'conditions': [ - ['chromeos==1 or toolkit_views==1', { + ['chromeos==1', { 'action': ['-D', 'chromeos'], }], ['use_titlecase_in_grd_files==1', { @@ -258,7 +258,7 @@ 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)'], 'conditions': [ - ['chromeos==1 or toolkit_views==1', { + ['chromeos==1', { 'action': ['-D', 'chromeos'], }], ['use_titlecase_in_grd_files==1', { @@ -315,7 +315,7 @@ '-D', '<(chrome_build)' ], 'conditions': [ - ['chromeos==1 or toolkit_views==1', { + ['chromeos==1', { 'action': ['-D', 'chromeos'], }], ['use_titlecase_in_grd_files==1', { |