ui/gfx/surface/surface.gyp - 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: ui/gfx/surface/surface.gyp

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: ui/gfx/surface/surface.gyp

diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp

index 0cbfe94024185f1ccc0e3e2eccf437f0c6cfa9c2..19aa1ba8581a110130acf150cc98c185923390b8 100644

--- a/ui/gfx/surface/surface.gyp

+++ b/ui/gfx/surface/surface.gyp

@@ -10,11 +10,13 @@

['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],

'conditions': [

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

- ['include', '/gtk/'],

- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],

- ['include', '/(gtk|x11)_[^/]*\\.cc$'],

- ]}],

+ ['toolkit_uses_gtk == 1', {

+ 'sources/': [

+ ['include', '/gtk/'],

+ ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],

+ ['include', '/(gtk|x11)_[^/]*\\.cc$'],

+ ],

+ }],

['OS=="mac"', {'sources/': [

['include', '/cocoa/'],

['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],

« chrome/chrome_tests.gypi ('K') | « ui/gfx/gl/gl.gyp ('k') | ui/ui.gyp » ('j') | no next file with comments »