diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-29 01:17:59 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-29 01:17:59 +0000 |
| commit | 94545ca9f13bc1f6716beb2fb3591b9ca43d33bf (patch) | |
| tree | 35884f2e416e301cd50707e79f9a7448c72c1e76 /chrome/chrome_browser_chromeos.gypi | |
| parent | 7bf2e1a65ec1d109655fbb68a0c1158597633623 (diff) | |
| download | chromium_src-94545ca9f13bc1f6716beb2fb3591b9ca43d33bf.zip chromium_src-94545ca9f13bc1f6716beb2fb3591b9ca43d33bf.tar.gz chromium_src-94545ca9f13bc1f6716beb2fb3591b9ca43d33bf.tar.bz2 | |
Remove USE_X11==1 check when including OutputConfigurator
This patch allows using OutputConfigurator and helpers to support configration on platforms other than X11 (such as Ozone).
This CL depends on https://codereview.chromium.org/214513006/
BUG=333413
Review URL: https://codereview.chromium.org/214693010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 95f70da..d70e02d 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -1008,7 +1008,6 @@ 'dependencies': [ '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:fontconfig', - '../build/linux/system.gyp:x11', '../ui/views/views.gyp:views', ], 'include_dirs': [ @@ -1020,6 +1019,11 @@ ['include', '^browser/chromeos/status/memory_menu_button.h'], ], }], + ['use_aura==1 and use_x11==1', { + 'dependencies': [ + '../build/linux/system.gyp:x11', + ], + }], ['enable_printing != 0', { 'dependencies': [ '../printing/printing.gyp:printing', |