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

Unified Diff: base/base.gypi

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 | « base/base.gyp ('k') | base/x11/edid_parser_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 8caee68d5ee911d2d5c3a0bd0163b80d053d9db9..cafb10dc900daaa2cdc3a20a9306c5ff25e822b4 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -669,6 +669,12 @@
'win/wrapped_window_proc.h',
],
'conditions': [
+ ['use_aura==1 and use_x11==1', {
+ 'sources': [
+ 'x11/edid_parser_x11.cc',
+ 'x11/edid_parser_x11.h',
+ ],
+ }],
['google_tv==1', {
'sources': [
'android/context_types.cc',
« no previous file with comments | « base/base.gyp ('k') | base/x11/edid_parser_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698