| Index: gyp/gpu.gypi
 | 
| diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
 | 
| index 8baa40fcaa646305994d308db20eb21ee915a05a..93957bf8a685a36062e463bfce5b7f60c0cb9a5f 100644
 | 
| --- a/gyp/gpu.gypi
 | 
| +++ b/gyp/gpu.gypi
 | 
| @@ -57,14 +57,8 @@
 | 
|  
 | 
|        '<(skia_src_path)/gpu/GrAutoLocaleSetter.h',
 | 
|        '<(skia_src_path)/gpu/GrAllocator.h',
 | 
| -      '<(skia_src_path)/gpu/GrAtlasTextBlob.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrAtlasTextBlob.h',
 | 
| -      '<(skia_src_path)/gpu/GrAtlasTextContext.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrAtlasTextContext.h',
 | 
|        '<(skia_src_path)/gpu/GrBatchAtlas.cpp',
 | 
|        '<(skia_src_path)/gpu/GrBatchAtlas.h',
 | 
| -      '<(skia_src_path)/gpu/GrBatchFontCache.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrBatchFontCache.h',
 | 
|        '<(skia_src_path)/gpu/GrBatchFlushState.cpp',
 | 
|        '<(skia_src_path)/gpu/GrBatchFlushState.h',
 | 
|        '<(skia_src_path)/gpu/GrBatchTest.cpp',
 | 
| @@ -82,15 +76,11 @@
 | 
|        '<(skia_src_path)/gpu/GrCoordTransform.cpp',
 | 
|        '<(skia_src_path)/gpu/GrDefaultGeoProcFactory.cpp',
 | 
|        '<(skia_src_path)/gpu/GrDefaultGeoProcFactory.h',
 | 
| -      '<(skia_src_path)/gpu/GrDistanceFieldAdjustTable.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrDistanceFieldAdjustTable.h',
 | 
|        '<(skia_src_path)/gpu/GrDrawContext.cpp',
 | 
|        '<(skia_src_path)/gpu/GrDrawingManager.cpp',
 | 
|        '<(skia_src_path)/gpu/GrDrawingManager.h',
 | 
|        '<(skia_src_path)/gpu/GrDrawTarget.cpp',
 | 
|        '<(skia_src_path)/gpu/GrDrawTarget.h',
 | 
| -      '<(skia_src_path)/gpu/GrFontScaler.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrFontScaler.h',
 | 
|        '<(skia_src_path)/gpu/GrFragmentProcessor.cpp',
 | 
|        '<(skia_src_path)/gpu/GrGeometryBuffer.h',
 | 
|        '<(skia_src_path)/gpu/GrGeometryProcessor.h',
 | 
| @@ -164,8 +154,6 @@
 | 
|        '<(skia_src_path)/gpu/GrResourceProvider.h',
 | 
|        '<(skia_src_path)/gpu/GrStencil.cpp',
 | 
|        '<(skia_src_path)/gpu/GrStencil.h',
 | 
| -      '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.h',
 | 
|        '<(skia_src_path)/gpu/GrStencilAttachment.cpp',
 | 
|        '<(skia_src_path)/gpu/GrStencilAttachment.h',
 | 
|        '<(skia_src_path)/gpu/GrStrokeInfo.cpp',
 | 
| @@ -180,18 +168,12 @@
 | 
|        '<(skia_src_path)/gpu/GrSoftwarePathRenderer.h',
 | 
|        '<(skia_src_path)/gpu/GrSurfacePriv.h',
 | 
|        '<(skia_src_path)/gpu/GrSurface.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrTextBlobCache.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrTextBlobCache.h',
 | 
| -      '<(skia_src_path)/gpu/GrTextContext.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrTextContext.h',
 | 
|        '<(skia_src_path)/gpu/GrTexture.cpp',
 | 
|        '<(skia_src_path)/gpu/GrTextureParamsAdjuster.h',
 | 
|        '<(skia_src_path)/gpu/GrTextureParamsAdjuster.cpp',
 | 
|        '<(skia_src_path)/gpu/GrTextureProvider.cpp',
 | 
|        '<(skia_src_path)/gpu/GrTexturePriv.h',
 | 
|        '<(skia_src_path)/gpu/GrTextureAccess.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrTextUtils.cpp',
 | 
| -      '<(skia_src_path)/gpu/GrTextUtils.h',
 | 
|        '<(skia_src_path)/gpu/GrTransferBuffer.h',
 | 
|        '<(skia_src_path)/gpu/GrTRecorder.h',
 | 
|        '<(skia_src_path)/gpu/GrVertexBuffer.h',
 | 
| @@ -295,6 +277,26 @@
 | 
|        '<(skia_src_path)/gpu/effects/GrYUVtoRGBEffect.cpp',
 | 
|        '<(skia_src_path)/gpu/effects/GrYUVtoRGBEffect.h',
 | 
|  
 | 
| +      # text
 | 
| +      '<(skia_src_path)/gpu/text/GrAtlasTextBlob.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrAtlasTextBlob.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrAtlasTextContext.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrAtlasTextContext.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrBatchFontCache.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrBatchFontCache.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrFontScaler.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrFontScaler.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrStencilAndCoverTextContext.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrStencilAndCoverTextContext.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextBlobCache.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextBlobCache.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextContext.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextContext.h',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextUtils.cpp',
 | 
| +      '<(skia_src_path)/gpu/text/GrTextUtils.h',
 | 
| +
 | 
|        '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
 | 
|        '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
 | 
|        '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp',
 | 
| 
 |