diff options
| author | epoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 18:27:11 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 18:27:11 +0000 |
| commit | 583b0f1a26425d897d888225391abd1ec6a0d443 (patch) | |
| tree | 8b15fd9cd517c6a715cac5819416aed17f07fdc0 /skia | |
| parent | b8822ea94a28915553d31e4bb8cab1a9b94873a5 (diff) | |
| download | chromium_src-583b0f1a26425d897d888225391abd1ec6a0d443.zip chromium_src-583b0f1a26425d897d888225391abd1ec6a0d443.tar.gz chromium_src-583b0f1a26425d897d888225391abd1ec6a0d443.tar.bz2 | |
Roll Skia DEPS to 3920
Review URL: https://chromiumcodereview.appspot.com/10384151
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index ea106f5..d6f0ab1 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -409,8 +409,6 @@ '../third_party/skia/src/gpu/GrTDArray.h', '../third_party/skia/src/gpu/GrTHashCache.h', '../third_party/skia/src/gpu/GrTLList.h', - '../third_party/skia/src/gpu/GrTesselatedPathRenderer.cpp', - '../third_party/skia/src/gpu/GrTesselatedPathRenderer.h', '../third_party/skia/src/gpu/GrTextStrike.cpp', '../third_party/skia/src/gpu/GrTextStrike.h', '../third_party/skia/src/gpu/GrTextStrike_impl.h', @@ -442,6 +440,8 @@ '../third_party/skia/src/gpu/gl/GrGLRenderTarget.h', '../third_party/skia/src/gpu/gl/GrGLSL.cpp', '../third_party/skia/src/gpu/gl/GrGLSL.h', + '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp', + '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.h', '../third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp', '../third_party/skia/src/gpu/gl/GrGLTexture.cpp', '../third_party/skia/src/gpu/gl/GrGLTexture.h', @@ -1005,7 +1005,6 @@ ], 'dependencies': [ 'skia_opts', - 'skia_libtess', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../third_party/sfntly/sfntly.gyp:sfntly', '../third_party/zlib/zlib.gyp:zlib', @@ -1222,48 +1221,6 @@ ], }, { - 'target_name': 'skia_libtess', - 'type': 'static_library', - 'variables': { - 'optimize': 'max', - }, - 'include_dirs': [ - '../third_party/skia/third_party/glu', - ], - 'sources': [ - '../third_party/skia/third_party/glu/sk_glu.h', - '../third_party/skia/third_party/glu/gluos.h', - '../third_party/skia/third_party/glu/libtess/dict-list.h', - '../third_party/skia/third_party/glu/libtess/dict.c', - '../third_party/skia/third_party/glu/libtess/dict.h', - '../third_party/skia/third_party/glu/libtess/geom.c', - '../third_party/skia/third_party/glu/libtess/geom.h', - '../third_party/skia/third_party/glu/libtess/memalloc.c', - '../third_party/skia/third_party/glu/libtess/memalloc.h', - '../third_party/skia/third_party/glu/libtess/mesh.c', - '../third_party/skia/third_party/glu/libtess/mesh.h', - '../third_party/skia/third_party/glu/libtess/normal.c', - '../third_party/skia/third_party/glu/libtess/normal.h', - '../third_party/skia/third_party/glu/libtess/priorityq-heap.h', - '../third_party/skia/third_party/glu/libtess/priorityq-sort.h', - '../third_party/skia/third_party/glu/libtess/priorityq.c', - '../third_party/skia/third_party/glu/libtess/priorityq.h', - '../third_party/skia/third_party/glu/libtess/render.c', - '../third_party/skia/third_party/glu/libtess/render.h', - '../third_party/skia/third_party/glu/libtess/sweep.c', - '../third_party/skia/third_party/glu/libtess/sweep.h', - '../third_party/skia/third_party/glu/libtess/tess.c', - '../third_party/skia/third_party/glu/libtess/tess.h', - '../third_party/skia/third_party/glu/libtess/tessmono.c', - '../third_party/skia/third_party/glu/libtess/tessmono.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/skia/third_party/glu', - ], - }, - }, - { 'target_name': 'image_operations_bench', 'type': 'executable', 'dependencies': [ |