diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:56:51 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:56:51 +0000 |
| commit | 8d415017601515d178cdae3a26704196072fa4b5 (patch) | |
| tree | 40fdd11e2d8ca302b6890553be54f71eb23b5c82 /build | |
| parent | 8e50de7369c44f135a94e779f7b9ff3857a04243 (diff) | |
| download | chromium_src-8d415017601515d178cdae3a26704196072fa4b5.zip chromium_src-8d415017601515d178cdae3a26704196072fa4b5.tar.gz chromium_src-8d415017601515d178cdae3a26704196072fa4b5.tar.bz2 | |
Revert 102005 - aura: Explicitly disable GTK.
Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a series of changes required to have chrome on aura build and link without GTK. This CL makes base/ build without GTK. Subsequent CLs will do this for other components.
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7904034
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/7978007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 2 | ||||
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | build/linux/system.gyp | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/build/build_config.h b/build/build_config.h index 0a42a47..5c09d45 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -45,7 +45,7 @@ // A flag derived from the above flags, used to cover GTK code in // both TOOLKIT_GTK and TOOLKIT_VIEWS. -#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN) && !defined(USE_AURA)) +#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN)) #define TOOLKIT_USES_GTK 1 #endif diff --git a/build/common.gypi b/build/common.gypi index aebb3c5..a4ab78cf 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -234,22 +234,15 @@ # Flags to use Gtk and X11 on non-Mac POSIX platforms ['OS=="win" or OS=="mac" or OS=="android"', { - 'use_glib%': 0, 'toolkit_uses_gtk%': 0, 'use_x11%': 0, }, { # TODO(dnicoara) Wayland build should have these disabled, but # currently GTK and X is too spread and it's hard to completely # remove every dependency. - 'use_glib%': 1, 'toolkit_uses_gtk%': 1, 'use_x11%': 1, }], - ['use_aura==1', { - 'use_glib%': 1, - 'toolkit_uses_gtk%': 0, - 'use_x11%': 1, - }], # A flag to enable or disable our compile-time dependency # on gnome-keyring. If that dependency is disabled, no gnome-keyring @@ -312,7 +305,6 @@ 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', 'os_posix%': '<(os_posix)', - 'use_glib%': '<(use_glib)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_skia%': '<(use_skia)', 'use_x11%': '<(use_x11)', diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 0a0b4e0..7578552 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -468,7 +468,6 @@ { 'target_name': 'glib', 'type': 'settings', - 'toolsets': ['host', 'target'], 'direct_dependent_settings': { 'cflags': [ '<!@(<(pkg-config) --cflags glib-2.0)', |