Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/chrome_browser_chromeos.gypi

Issue 214693010: Remove USE_X11==1 check when including OutputConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_chromeos.gypi
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 95f70daeaa8770f1e8ab05df372e938599f19619..d70e02d026be58878ca0f8eb0983099a6345f908 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',
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698