diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 23:30:18 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 23:30:18 +0000 |
| commit | d3a2cefb1df16176943e1cb14d01a761d7398eea (patch) | |
| tree | b0d5e932a09cfaef1ff9938c2d9c586ec849e7f0 /build | |
| parent | 7477ea6f6a173b586622fd276433a346760ffbf4 (diff) | |
| download | chromium_src-d3a2cefb1df16176943e1cb14d01a761d7398eea.zip chromium_src-d3a2cefb1df16176943e1cb14d01a761d7398eea.tar.gz chromium_src-d3a2cefb1df16176943e1cb14d01a761d7398eea.tar.bz2 | |
Change chromeos build to use views
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/508025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1d4da45..d1caf37 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -224,7 +224,7 @@ }, { 'linux_dump_symbols%': 0, }], - ['toolkit_views==0', { + ['toolkit_views==0 and chromeos==0', { # GTK wants Title Case strings 'use_titlecase_in_grd_files%': 1, }], @@ -318,12 +318,9 @@ ['chrome_frame_define', { 'defines': ['CHROME_FRAME_BUILD'], }], - ['toolkit_views==1', { + ['toolkit_views==1 or chromeos==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], - ['chromeos==1', { - 'defines': ['CHROMEOS_TRANSITIONAL=1'], - }], ['chromeos==1 or toolkit_views==1', { 'defines': ['OS_CHROMEOS=1'], }], @@ -1067,7 +1064,7 @@ ['chromeos!=1', { 'sources/': [ ['exclude', '_chromeos\\.cc$'] ] }], - ['OS!="win" and toolkit_views!=1', { + ['OS!="win" and (toolkit_views==0 and chromeos==0)', { 'sources/': [ ['exclude', '_views\\.cc$'] ] }], ], |