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

Unified Diff: base/base.gyp

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | « no previous file | build/linux/system.gyp » ('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 8118d87a54a29f54f799d41e578a9e7d6643ef14..54cd07c05ee722d26427cdcedd4ae0c4841d4a45 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -62,7 +62,6 @@
'dependencies': [
'symbolize',
'../build/linux/system.gyp:glib',
- '../build/linux/system.gyp:x11',
'xdg_mime',
],
'defines': [
@@ -73,7 +72,6 @@
],
'export_dependent_settings': [
'../build/linux/system.gyp:glib',
- '../build/linux/system.gyp:x11',
],
}, { # use_glib!=1
'sources/': [
@@ -81,6 +79,14 @@
['exclude', '_nss\\.cc$'],
],
}],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
+ ],
+ 'export_dependent_settings': [
+ '../build/linux/system.gyp:x11',
+ ],
+ }],
['OS == "android" and _toolset == "host"', {
# Base for host support is the minimum required to run the
# ssl false start blacklist tool. It requires further changes
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698