chrome/chrome_browser_extensions.gypi - Issue 148643002: Hide X11 dependencies when use_x11=0.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser_extensions.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:

Index: chrome/chrome_browser_extensions.gypi

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi

index 9a7140f26a95c63c12b73dcf6b2204b14834a91d..f003646ce1bce287739d7c2a2231761b20ebbdbf 100644

--- a/chrome/chrome_browser_extensions.gypi

+++ b/chrome/chrome_browser_extensions.gypi

@@ -1028,12 +1028,21 @@

'../ui/keyboard/keyboard.gyp:keyboard_resources',

}],

- ['OS=="linux" and use_aura==1', {

- 'dependencies': [

- '../build/linux/system.gyp:dbus',

- '../build/linux/system.gyp:fontconfig',

- '../build/linux/system.gyp:x11',

- '../dbus/dbus.gyp:dbus',

+ ['OS=="linux"', {

+ 'conditions': [

+ ['use_aura==1', {

+ 'dependencies': [

+ '../build/linux/system.gyp:dbus',

+ '../build/linux/system.gyp:fontconfig',

+ '../dbus/dbus.gyp:dbus',

+ ],

+ }],

+ # x11 build

+ ['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.

+ ],

+ }],

}],

['safe_browsing==1', {