content/content_common.gypi - Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo

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 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address feedback, try to fix cros_x86 gyp error 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: content/content_common.gypi

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

index 750d799d8027137d99ef6b1ddc6c70de7237440e..f5fa62ea9d47ee3402c26e556d94371242eb4707 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -498,11 +498,9 @@

'include_dirs': [

'<(DEPTH)/third_party/khronos',

- 'link_settings': {

- 'libraries': [

- '-lXcomposite',

- ],

- },

+ 'dependencies': [

+ '<(DEPTH)/build/linux/system.gyp:xcomposite',

+ ],

}],

['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {

'sources': [

« no previous file with comments | « chromeos/chromeos.gyp ('k') | content/content_plugin.gypi » ('j') | no next file with comments »