skia/skia.gyp - Issue 10828203: Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).

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

Issue 10828203: Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Let's try GYP r1446. Created 8 years, 4 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:

View side-by-side diff with in-line comments

Download patch

Index: skia/skia.gyp

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

index 028e5c7d92296fa13399e3be70eb0b3d24818953..b58696fb821c5a8bf49dbf13e9a04d59c36870b3 100644

--- a/skia/skia.gyp

+++ b/skia/skia.gyp

@@ -824,9 +824,7 @@

'SK_GAMMA_SRGB',

#'SK_GAMMA_APPLY_TO_A8',

'SK_BUILD_NO_IMAGE_ENCODE',

- # TODO(alexeypa): fix quoting in the skia sources,

- # see http://crbug.com/141132.

- 'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',

+ 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',

'GR_STATIC_RECT_VB=1',

'GR_AGGRESSIVE_SHADER_OPTS=1',

'SK_DISABLE_FAST_AA_STROKE_RECT',

@@ -1113,9 +1111,7 @@

'defines': [

'SK_BUILD_NO_IMAGE_ENCODE',

'SK_DEFERRED_CANVAS_USES_GPIPE=1',

- # TODO(alexeypa): fix quoting in the skia sources,

- # see http://crbug.com/141132.

- 'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',

+ 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',

'GR_AGGRESSIVE_SHADER_OPTS=1',

'conditions': [

« no previous file with comments | « remoting/tools/uuidgen.py ('k') | no next file » | no next file with comments »