diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 04:25:07 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 04:25:07 +0000 |
| commit | 3387e48402e3f2cd4e322ae1bd21d7ece3ce55f1 (patch) | |
| tree | 201b9368bbaa25113f0b3c310491dc9feb78a3f4 /skia/skia.gyp | |
| parent | ed3f6cc71c6824d9b607f556fac0113a39f4d90c (diff) | |
| download | chromium_src-3387e48402e3f2cd4e322ae1bd21d7ece3ce55f1.zip chromium_src-3387e48402e3f2cd4e322ae1bd21d7ece3ce55f1.tar.gz chromium_src-3387e48402e3f2cd4e322ae1bd21d7ece3ce55f1.tar.bz2 | |
Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).
Rolling GYP to r1458 to undo (r1457, r1452, r1450, r1449).
BUG=141132, 137755
TBR=alexeypa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10828203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 028e5c7..b58696f 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': [ |