content/content_common.gypi - Issue 7011032: Make the gyp files more cross-platform across the Unices

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: content/content_common.gypi

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: updated to trunk and added spaces, collapsed one check Created 9 years, 7 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: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 5e237d4e060042825a374461a0b14ec69cebecab..ebc0e253c2ab2a440eeda1d85bd7a287a088165f 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -266,12 +266,12 @@

}],

- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {

+ ['toolkit_uses_gtk == 1', {

'dependencies': [

'../build/linux/system.gyp:gtk',

}],

- ['OS=="linux" and target_arch!="arm"', {

+ ['use_x11 == 1 and target_arch != "arm"', {

'sources': [

'common/gpu/x_util.cc',

'common/gpu/x_util.h',