remoting/remoting.gyp - Issue 12563002: x11: Include X11 dependencies only when building with X11.

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: remoting/remoting.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:

Index: remoting/remoting.gyp

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp

index eb4ce4affd1ff1c7dd41a52d2fceb013d4198e0e..5acca23a241e96056fceb3721df108871be9fbc6 100644

--- a/remoting/remoting.gyp

+++ b/remoting/remoting.gyp

@@ -55,8 +55,8 @@

'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',

'conditions': [

- # Remoting host is supported only on Windows, OSX and Linux.

- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {

+ # Remoting host is supported only on Windows, OSX and Linux (with X11).

+ ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {

Wez 2013/03/07 18:33:01 nit: Wrap the open brace to the next line.

Sergey Ulanov 2013/03/07 19:39:09 condition wrapping is not a supported feature in g

'enable_remoting_host': 1,

}, {

'enable_remoting_host': 0,

« media/media.gyp ('K') | « media/media.gyp ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »