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

Unified Diff: chrome/chrome_exe.gypi

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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
« chrome/chrome_browser_ui.gypi ('K') | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index f589d1ae14d69a557487be8b9754b3143f33f2e4..ab2f0f1dfe7745e0e40a2cfb7fdee46a2325c180 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -201,13 +201,18 @@
'<@(chromium_child_dependencies)',
'../content/content.gyp:content_app_both',
# Needed for chrome_main.cc initialization of libraries.
- '../build/linux/system.gyp:x11',
'../build/linux/system.gyp:pangocairo',
- '../build/linux/system.gyp:xext',
# Needed to use the master_preferences functions
'installer_util',
],
}],
+ # x11 build. Needed for chrome_main.cc initialization of libraries.
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
sky 2014/01/28 00:43:07 nit: indent.
kalyank 2014/01/28 01:18:47 Done.
+ '../build/linux/system.gyp:xext',
+ ],
+ }],
],
'sources': [
'app/chrome_dll_resource.h',
« chrome/chrome_browser_ui.gypi ('K') | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698