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

Unified Diff: base/base.gyp

Issue 24459002: Reland linux_aura: Implement most of DesktopScreenX11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Theoretical fix for chromeos Created 7 years, 3 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 | « no previous file | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 39f6015dba1f2feb436ce272430a277dfb18ac54..4611f62a55b0e1f2560d6e442ff8ef886fa4a728 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -77,6 +77,14 @@
'../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
@@ -809,6 +817,11 @@
'win/win_util_unittest.cc',
],
}],
+ ['use_aura==1 and use_x11==1', {
+ 'sources': [
+ 'x11/edid_parser_x11_unittest.cc',
+ ],
+ }],
['use_system_nspr==1', {
'dependencies': [
'third_party/nspr/nspr.gyp:nspr',
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698