diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 05:30:30 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 05:30:30 +0000 |
commit | 8238e0830cd0423397313ebbe5ab4943109f3b0a (patch) | |
tree | 35b828fbd0a923fe8e19116f50976b2ec4e5fac6 /base | |
parent | be6d0e4c0f7f150410b56a3b6a8114054345d26a (diff) | |
download | chromium_src-8238e0830cd0423397313ebbe5ab4943109f3b0a.zip chromium_src-8238e0830cd0423397313ebbe5ab4943109f3b0a.tar.gz chromium_src-8238e0830cd0423397313ebbe5ab4943109f3b0a.tar.bz2 |
base: Remove dependency on x11.
All of the X11-dependent code have been removed from base/. So remove
the x11 dependency.
BUG=354062
R=darin@chromium.org
Review URL: https://codereview.chromium.org/237403002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/BUILD.gn | 12 | ||||
-rw-r--r-- | base/base.gyp | 21 |
2 files changed, 0 insertions, 33 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index feff58b..0ee30dc 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -808,11 +808,6 @@ component("base") { if (toolkit_uses_gtk) { linux_configs += [ "//build/config/linux:gtk" ] } - if (use_x11) { - linux_configs += [ - "//build/config/linux:x11", - ] - } configs += linux_configs all_dependent_configs = linux_configs @@ -836,13 +831,6 @@ component("base") { ] } - if (!use_x11) { - sources -= [ - "message_loop/message_pump_x11.cc", - "message_loop/message_pump_x11.h", - ] - } - if (!use_glib) { sources -= [ "message_loop/message_pump_glib.cc", diff --git a/base/base.gyp b/base/base.gyp index 12d2a5f..0663b27 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -70,22 +70,6 @@ '../build/linux/system.gyp:glib', ], }], - ['use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:x11', - ], - 'export_dependent_settings': [ - '../build/linux/system.gyp:x11', - ], - }], - ['use_aura==1 and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:xrandr', - ], - 'export_dependent_settings': [ - '../build/linux/system.gyp:xrandr', - ], - }], ['OS == "android" and _toolset == "host"', { # Always build base as a static_library for host toolset, even if # we're doing a component build. Specifically, we only care about the @@ -722,11 +706,6 @@ }], ], }], - ['use_x11 == 1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], ['use_glib == 1', { 'dependencies': [ '../build/linux/system.gyp:glib', |