diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 19:39:52 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 19:39:52 +0000 |
| commit | 9d43e371e6c0b70b938575690f561f3742ad8397 (patch) | |
| tree | c81e3799f4a55ca713e86d673ccdf94fc1641dc1 /build/common.gypi | |
| parent | 5b5e1e2f5f30d1f4eaf5a1ae4ae95a7ccc2eab7b (diff) | |
| download | chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.zip chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.tar.gz chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.tar.bz2 | |
These are the changes necessary for views to be able to build w/ use_aura implying no gtk.
BUG=97131
TEST=views_unittests
Review URL: http://codereview.chromium.org/7996008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 79a1880..df25848 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -237,7 +237,7 @@ 'use_x11%': 1, }], ['use_aura==1 and OS!="win"', { - 'toolkit_uses_gtk%': 1, + 'toolkit_uses_gtk%': 0, }], # A flag to enable or disable our compile-time dependency @@ -856,6 +856,9 @@ ['use_aura==1', { 'defines': ['USE_AURA=1'], }], + ['toolkit_uses_gtk==1', { + 'defines': ['TOOLKIT_USES_GTK=1'], + }], ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], |