summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 01:16:57 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 01:16:57 +0000
commitfdc5bed00bdcf59f90777142c44eecde407ef23e (patch)
tree150f199e6f882943f68c3d3cfbee7ea34f195cda /base
parent7ffe3aae33df556c298680c8754b76578e93c9eb (diff)
downloadchromium_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 'base')
-rw-r--r--base/base.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 9421717..fc7c811 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -362,7 +362,7 @@
'conditions': [
[ 'OS == "linux" or OS == "freebsd"', {
'conditions': [
- [ 'chromeos==1 or toolkit_views==1', {
+ [ 'chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
},
],