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

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

index 98adcf82fbe96dad97eec3da18e9fac307a6e6e9..8a6f66ab8b0d47727e6ba78dd67333590a508431 100644

--- a/ui/gfx/compositor/compositor.gyp

+++ b/ui/gfx/compositor/compositor.gyp

@@ -8,12 +8,12 @@

['exclude', '_(gl|win)\\.(cc?)$'],

'conditions': [

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

- ['include', '_(gl)\\.cc$'],

- ]}],

- ['OS=="win"', {'sources/': [

- ['include', '_(win)\\.cc$'],

- ]}],

+ ['os_posix == 1 and OS != "mac"', {

+ 'sources/': [['include', '_(gl)\\.cc$'],]

+ }],

+ ['OS == "win"', {

+ 'sources/': [['include', '_(win)\\.cc$'],]

+ }],

'targets': [

@@ -33,7 +33,7 @@

'compositor_gl.cc',

'conditions': [

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

+ ['os_posix == 1 and OS != "mac"', {

'sources!': [

'compositor.cc',