diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-03 01:05:50 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-03 01:05:50 +0000 |
| commit | 25501ce03e15e3e9f9d4fc7db4652e0ab6a77c63 (patch) | |
| tree | e2aa339f43175683f00ce0b5c025323c9a1f4a7d | |
| parent | d8c21a503a174334dab5618ccccda9e9b288813c (diff) | |
| parent | 5558450099591dffc0a241e4c65e878e614c4c53 (diff) | |
| download | gyp-25501ce03e15e3e9f9d4fc7db4652e0ab6a77c63.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 5558450099591dffc0a241e4c65e878e614c4c53
This commit was generated by merge_from_chromium.py.
Change-Id: Ifc955838049c6dca58a472046a37894cd0fd6e0d
| -rw-r--r-- | gpu.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -9,6 +9,7 @@ 'variables': { 'skgpu_sources': [ '<(skia_include_path)/gpu/GrBackendEffectFactory.h', + '<(skia_include_path)/gpu/GrCacheable.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', @@ -20,13 +21,13 @@ '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', + '<(skia_include_path)/gpu/GrGpuObject.h', '<(skia_include_path)/gpu/GrKey.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPathRendererChain.h', '<(skia_include_path)/gpu/GrPoint.h', '<(skia_include_path)/gpu/GrRect.h', '<(skia_include_path)/gpu/GrRenderTarget.h', - '<(skia_include_path)/gpu/GrResource.h', '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTBackendEffectFactory.h', '<(skia_include_path)/gpu/GrTexture.h', @@ -78,6 +79,7 @@ '<(skia_src_path)/gpu/GrClipMaskManager.cpp', '<(skia_src_path)/gpu/GrGpu.cpp', '<(skia_src_path)/gpu/GrGpu.h', + '<(skia_src_path)/gpu/GrGpuObject.cpp', '<(skia_src_path)/gpu/GrGpuFactory.cpp', '<(skia_src_path)/gpu/GrIndexBuffer.h', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', @@ -107,7 +109,6 @@ '<(skia_src_path)/gpu/GrRenderTarget.cpp', '<(skia_src_path)/gpu/GrReducedClip.cpp', '<(skia_src_path)/gpu/GrReducedClip.h', - '<(skia_src_path)/gpu/GrResource.cpp', '<(skia_src_path)/gpu/GrResourceCache.cpp', '<(skia_src_path)/gpu/GrResourceCache.h', '<(skia_src_path)/gpu/GrStencil.cpp', |