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

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: Review Fix: remove blank lines Created 6 years, 10 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 | « chrome/chrome_browser_ui.gypi ('k') | gpu/tools/tools.gyp » ('j') | 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 5e5f582d2b5c4fbc14898376f8216c5ef16452fd..7ef8f48dec3a4ae29bb24069d92b90547ada025b 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',
+ '../build/linux/system.gyp:xext',
+ ],
+ }],
],
'sources': [
'app/chrome_dll_resource.h',
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | gpu/tools/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698