chromeos/chromeos.gyp - 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: chromeos/chromeos.gyp

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: chromeos/chromeos.gyp

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

index 33cc69500be2ca8948e5cb7ae7425a7776dd9512..a8c98a47915454f48eed174ef290c706b30adc56 100644

--- a/chromeos/chromeos.gyp

+++ b/chromeos/chromeos.gyp

@@ -345,15 +345,11 @@

['use_x11 == 1', {

'dependencies': [

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

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

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

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

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

- 'link_settings': {

- 'libraries': [

- '-lX11',

- '-lXext',

- '-lXi',

- '-lXrandr',

- ],

- },

}, {

# use_x11 == 0

'sources!': [

« no previous file with comments | « chrome/chrome_common.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »