summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 18:47:46 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 18:47:46 +0000
commit039782b59385ce386d760cd81a5e3283b3dd81fb (patch)
treeb347e54b324dffac886247619dfd0b3afdb6f49c /skia
parentbfe22d36c630f7d8dce0d3026c18eb00ff4a4513 (diff)
downloadchromium_src-039782b59385ce386d760cd81a5e3283b3dd81fb.zip
chromium_src-039782b59385ce386d760cd81a5e3283b3dd81fb.tar.gz
chromium_src-039782b59385ce386d760cd81a5e3283b3dd81fb.tar.bz2
Roll Skia to r3216
Control: http://codereview.chromium.org/9252024/ Review URL: https://chromiumcodereview.appspot.com/9417008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index a0817d8..09a162d 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -408,8 +408,6 @@
'../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
'../third_party/skia/src/gpu/gl/GrGLCaps.cpp',
'../third_party/skia/src/gpu/gl/GrGLCaps.h',
- '../third_party/skia/src/gpu/gl/GrGLColorConversionTest.cpp',
- '../third_party/skia/src/gpu/gl/GrGLColorConversionTest.h',
'../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp',
'../third_party/skia/src/gpu/gl/GrGLContextInfo.h',
'../third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',