Use skia's core.gypi to name core src and include files, rather than duplicating that list

in chrome. Hopefully other .gypi sharing can follow.
Review URL: https://chromiumcodereview.appspot.com/10854130

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151463 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 400 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index e8d5a7f..68846e5 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -9,326 +9,19 @@
       'type': '<(component)',
       'variables': {
         'optimize': 'max',
+
+        # These two set the paths so we can include skia/gyp/core.gypi
+        'skia_src_path': '../third_party/skia/src',
+        'skia_include_path': '../third_party/skia/include',
       },
-      'sources': [
-        #'../third_party/skia/src/animator/SkAnimate.h',
-        #'../third_party/skia/src/animator/SkAnimateActive.cpp',
-        #'../third_party/skia/src/animator/SkAnimateActive.h',
-        #'../third_party/skia/src/animator/SkAnimateBase.cpp',
-        #'../third_party/skia/src/animator/SkAnimateBase.h',
-        #'../third_party/skia/src/animator/SkAnimateField.cpp',
-        #'../third_party/skia/src/animator/SkAnimateMaker.cpp',
-        #'../third_party/skia/src/animator/SkAnimateMaker.h',
-        #'../third_party/skia/src/animator/SkAnimateProperties.h',
-        #'../third_party/skia/src/animator/SkAnimateSchema.xsd',
-        #'../third_party/skia/src/animator/SkAnimateSchema.xsx',
-        #'../third_party/skia/src/animator/SkAnimateSet.cpp',
-        #'../third_party/skia/src/animator/SkAnimateSet.h',
-        #'../third_party/skia/src/animator/SkAnimator.cpp',
-        #'../third_party/skia/src/animator/SkAnimatorScript.cpp',
-        #'../third_party/skia/src/animator/SkAnimatorScript.h',
-        #'../third_party/skia/src/animator/SkAnimatorScript2.cpp',
-        #'../third_party/skia/src/animator/SkAnimatorScript2.h',
-        #'../third_party/skia/src/animator/SkBase64.cpp',
-        #'../third_party/skia/src/animator/SkBase64.h',
-        #'../third_party/skia/src/animator/SkBoundable.cpp',
-        #'../third_party/skia/src/animator/SkBoundable.h',
-        #'../third_party/skia/src/animator/SkBuildCondensedInfo.cpp',
-        #'../third_party/skia/src/animator/SkCondensedDebug.cpp',
-        #'../third_party/skia/src/animator/SkCondensedRelease.cpp',
-        #'../third_party/skia/src/animator/SkDisplayAdd.cpp',
-        #'../third_party/skia/src/animator/SkDisplayAdd.h',
-        #'../third_party/skia/src/animator/SkDisplayApply.cpp',
-        #'../third_party/skia/src/animator/SkDisplayApply.h',
-        #'../third_party/skia/src/animator/SkDisplayBounds.cpp',
-        #'../third_party/skia/src/animator/SkDisplayBounds.h',
-        #'../third_party/skia/src/animator/SkDisplayEvent.cpp',
-        #'../third_party/skia/src/animator/SkDisplayEvent.h',
-        #'../third_party/skia/src/animator/SkDisplayEvents.cpp',
-        #'../third_party/skia/src/animator/SkDisplayEvents.h',
-        #'../third_party/skia/src/animator/SkDisplayInclude.cpp',
-        #'../third_party/skia/src/animator/SkDisplayInclude.h',
-        #'../third_party/skia/src/animator/SkDisplayInput.cpp',
-        #'../third_party/skia/src/animator/SkDisplayInput.h',
-        #'../third_party/skia/src/animator/SkDisplayList.cpp',
-        #'../third_party/skia/src/animator/SkDisplayList.h',
-        #'../third_party/skia/src/animator/SkDisplayMath.cpp',
-        #'../third_party/skia/src/animator/SkDisplayMath.h',
-        #'../third_party/skia/src/animator/SkDisplayMovie.cpp',
-        #'../third_party/skia/src/animator/SkDisplayMovie.h',
-        #'../third_party/skia/src/animator/SkDisplayNumber.cpp',
-        #'../third_party/skia/src/animator/SkDisplayNumber.h',
-        #'../third_party/skia/src/animator/SkDisplayPost.cpp',
-        #'../third_party/skia/src/animator/SkDisplayPost.h',
-        #'../third_party/skia/src/animator/SkDisplayRandom.cpp',
-        #'../third_party/skia/src/animator/SkDisplayRandom.h',
-        #'../third_party/skia/src/animator/SkDisplayScreenplay.cpp',
-        #'../third_party/skia/src/animator/SkDisplayScreenplay.h',
-        #'../third_party/skia/src/animator/SkDisplayType.cpp',
-        #'../third_party/skia/src/animator/SkDisplayType.h',
-        #'../third_party/skia/src/animator/SkDisplayTypes.cpp',
-        #'../third_party/skia/src/animator/SkDisplayTypes.h',
-        #'../third_party/skia/src/animator/SkDisplayXMLParser.cpp',
-        #'../third_party/skia/src/animator/SkDisplayXMLParser.h',
-        #'../third_party/skia/src/animator/SkDisplayable.cpp',
-        #'../third_party/skia/src/animator/SkDisplayable.h',
-        #'../third_party/skia/src/animator/SkDraw3D.cpp',
-        #'../third_party/skia/src/animator/SkDraw3D.h',
-        #'../third_party/skia/src/animator/SkDrawBitmap.cpp',
-        #'../third_party/skia/src/animator/SkDrawBitmap.h',
-        #'../third_party/skia/src/animator/SkDrawBlur.cpp',
-        #'../third_party/skia/src/animator/SkDrawBlur.h',
-        #'../third_party/skia/src/animator/SkDrawClip.cpp',
-        #'../third_party/skia/src/animator/SkDrawClip.h',
-        #'../third_party/skia/src/animator/SkDrawColor.cpp',
-        #'../third_party/skia/src/animator/SkDrawColor.h',
-        #'../third_party/skia/src/animator/SkDrawDash.cpp',
-        #'../third_party/skia/src/animator/SkDrawDash.h',
-        #'../third_party/skia/src/animator/SkDrawDiscrete.cpp',
-        #'../third_party/skia/src/animator/SkDrawDiscrete.h',
-        #'../third_party/skia/src/animator/SkDrawEmboss.cpp',
-        #'../third_party/skia/src/animator/SkDrawEmboss.h',
-        #'../third_party/skia/src/animator/SkDrawExtraPathEffect.cpp',
-        #'../third_party/skia/src/animator/SkDrawFull.cpp',
-        #'../third_party/skia/src/animator/SkDrawFull.h',
-        #'../third_party/skia/src/animator/SkDrawGradient.cpp',
-        #'../third_party/skia/src/animator/SkDrawGradient.h',
-        #'../third_party/skia/src/animator/SkDrawGroup.cpp',
-        #'../third_party/skia/src/animator/SkDrawGroup.h',
-        #'../third_party/skia/src/animator/SkDrawLine.cpp',
-        #'../third_party/skia/src/animator/SkDrawLine.h',
-        #'../third_party/skia/src/animator/SkDrawMatrix.cpp',
-        #'../third_party/skia/src/animator/SkDrawMatrix.h',
-        #'../third_party/skia/src/animator/SkDrawOval.cpp',
-        #'../third_party/skia/src/animator/SkDrawOval.h',
-        #'../third_party/skia/src/animator/SkDrawPaint.cpp',
-        #'../third_party/skia/src/animator/SkDrawPaint.h',
-        #'../third_party/skia/src/animator/SkDrawPath.cpp',
-        #'../third_party/skia/src/animator/SkDrawPath.h',
-        #'../third_party/skia/src/animator/SkDrawPoint.cpp',
-        #'../third_party/skia/src/animator/SkDrawPoint.h',
-        #'../third_party/skia/src/animator/SkDrawRectangle.cpp',
-        #'../third_party/skia/src/animator/SkDrawRectangle.h',
-        #'../third_party/skia/src/animator/SkDrawSaveLayer.cpp',
-        #'../third_party/skia/src/animator/SkDrawSaveLayer.h',
-        #'../third_party/skia/src/animator/SkDrawShader.cpp',
-        #'../third_party/skia/src/animator/SkDrawShader.h',
-        #'../third_party/skia/src/animator/SkDrawText.cpp',
-        #'../third_party/skia/src/animator/SkDrawText.h',
-        #'../third_party/skia/src/animator/SkDrawTextBox.cpp',
-        #'../third_party/skia/src/animator/SkDrawTextBox.h',
-        #'../third_party/skia/src/animator/SkDrawTo.cpp',
-        #'../third_party/skia/src/animator/SkDrawTo.h',
-        #'../third_party/skia/src/animator/SkDrawTransparentShader.cpp',
-        #'../third_party/skia/src/animator/SkDrawTransparentShader.h',
-        #'../third_party/skia/src/animator/SkDrawable.cpp',
-        #'../third_party/skia/src/animator/SkDrawable.h',
-        #'../third_party/skia/src/animator/SkDump.cpp',
-        #'../third_party/skia/src/animator/SkDump.h',
-        #'../third_party/skia/src/animator/SkExtraPathEffects.xsd',
-        #'../third_party/skia/src/animator/SkExtras.h',
-        #'../third_party/skia/src/animator/SkGetCondensedInfo.cpp',
-        #'../third_party/skia/src/animator/SkHitClear.cpp',
-        #'../third_party/skia/src/animator/SkHitClear.h',
-        #'../third_party/skia/src/animator/SkHitTest.cpp',
-        #'../third_party/skia/src/animator/SkHitTest.h',
-        #'../third_party/skia/src/animator/SkIntArray.h',
-        #'../third_party/skia/src/animator/SkMatrixParts.cpp',
-        #'../third_party/skia/src/animator/SkMatrixParts.h',
-        #'../third_party/skia/src/animator/SkMemberInfo.cpp',
-        #'../third_party/skia/src/animator/SkMemberInfo.h',
-        #'../third_party/skia/src/animator/SkOpArray.cpp',
-        #'../third_party/skia/src/animator/SkOpArray.h',
-        #'../third_party/skia/src/animator/SkOperand.h',
-        #'../third_party/skia/src/animator/SkOperand2.h',
-        #'../third_party/skia/src/animator/SkOperandInterpolator.h',
-        #'../third_party/skia/src/animator/SkOperandIterpolator.cpp',
-        #'../third_party/skia/src/animator/SkPaintParts.cpp',
-        #'../third_party/skia/src/animator/SkPaintParts.h',
-        #'../third_party/skia/src/animator/SkParseSVGPath.cpp',
-        #'../third_party/skia/src/animator/SkPathParts.cpp',
-        #'../third_party/skia/src/animator/SkPathParts.h',
-        #'../third_party/skia/src/animator/SkPostParts.cpp',
-        #'../third_party/skia/src/animator/SkPostParts.h',
-        #'../third_party/skia/src/animator/SkScript.cpp',
-        #'../third_party/skia/src/animator/SkScript.h',
-        #'../third_party/skia/src/animator/SkScript2.h',
-        #'../third_party/skia/src/animator/SkScriptCallBack.h',
-        #'../third_party/skia/src/animator/SkScriptDecompile.cpp',
-        #'../third_party/skia/src/animator/SkScriptRuntime.cpp',
-        #'../third_party/skia/src/animator/SkScriptRuntime.h',
-        #'../third_party/skia/src/animator/SkScriptTokenizer.cpp',
-        #'../third_party/skia/src/animator/SkSnapshot.cpp',
-        #'../third_party/skia/src/animator/SkSnapshot.h',
-        #'../third_party/skia/src/animator/SkTDArray_Experimental.h',
-        #'../third_party/skia/src/animator/SkTextOnPath.cpp',
-        #'../third_party/skia/src/animator/SkTextOnPath.h',
-        #'../third_party/skia/src/animator/SkTextToPath.cpp',
-        #'../third_party/skia/src/animator/SkTextToPath.h',
-        #'../third_party/skia/src/animator/SkTypedArray.cpp',
-        #'../third_party/skia/src/animator/SkTypedArray.h',
-        #'../third_party/skia/src/animator/SkXMLAnimatorWriter.cpp',
-        #'../third_party/skia/src/animator/SkXMLAnimatorWriter.h',
 
-        '../third_party/skia/src/animator/SkTime.cpp',
+      'includes': [
+        '../third_party/skia/gyp/core.gypi',
+      ],
 
-        '../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
-        '../third_party/skia/src/core/Sk64.cpp',
-        '../third_party/skia/src/core/SkAAClip.cpp',
-        '../third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp',
-        '../third_party/skia/src/core/SkAnnotation.cpp',
-        '../third_party/skia/src/core/SkAlphaRuns.cpp',
-        '../third_party/skia/src/core/SkAntiRun.h',
-        '../third_party/skia/src/core/SkAutoKern.h',
-        '../third_party/skia/src/core/SkBitmap.cpp',
-        '../third_party/skia/src/core/SkBitmapHeap.cpp',
-        '../third_party/skia/src/core/SkBitmapProcShader.cpp',
-        '../third_party/skia/src/core/SkBitmapProcShader.h',
-        '../third_party/skia/src/core/SkBitmapProcState.cpp',
-        '../third_party/skia/src/core/SkBitmapProcState.h',
-        '../third_party/skia/src/core/SkBitmapProcState_matrix.h',
-        '../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp',
-        '../third_party/skia/src/core/SkBitmapProcState_sample.h',
-        '../third_party/skia/src/core/SkBitmapSampler.cpp',
-        '../third_party/skia/src/core/SkBitmapSampler.h',
-        '../third_party/skia/src/core/SkBitmapSamplerTemplate.h',
-        '../third_party/skia/src/core/SkBitmapShader16BilerpTemplate.h',
-        '../third_party/skia/src/core/SkBitmapShaderTemplate.h',
-        '../third_party/skia/src/core/SkBitmap_scroll.cpp',
-        '../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
-        '../third_party/skia/src/core/SkBlitMask_D32.cpp',
-        '../third_party/skia/src/core/SkBlitRow_D16.cpp',
-        '../third_party/skia/src/core/SkBlitRow_D32.cpp',
-        '../third_party/skia/src/core/SkBlitRow_D4444.cpp',
-        '../third_party/skia/src/core/SkBlitter.cpp',
-        '../third_party/skia/src/core/SkBlitter.h',
-        '../third_party/skia/src/core/SkBlitter_4444.cpp',
-        '../third_party/skia/src/core/SkBlitter_A1.cpp',
-        '../third_party/skia/src/core/SkBlitter_A8.cpp',
-        '../third_party/skia/src/core/SkBlitter_ARGB32.cpp',
-        '../third_party/skia/src/core/SkBlitter_RGB16.cpp',
-        '../third_party/skia/src/core/SkBlitter_Sprite.cpp',
-        '../third_party/skia/src/core/SkBuffer.cpp',
-        '../third_party/skia/src/core/SkCanvas.cpp',
-        '../third_party/skia/src/core/SkChunkAlloc.cpp',
-        '../third_party/skia/src/core/SkClipStack.cpp',
-        '../third_party/skia/src/core/SkColor.cpp',
-        '../third_party/skia/src/core/SkColorFilter.cpp',
-        '../third_party/skia/src/core/SkColorTable.cpp',
-        '../third_party/skia/src/core/SkComposeShader.cpp',
-        '../third_party/skia/src/core/SkConcaveToTriangles.cpp',
-        '../third_party/skia/src/core/SkConcaveToTriangles.h',
-        '../third_party/skia/src/core/SkConfig8888.cpp',
-        '../third_party/skia/src/core/SkConfig8888.h',
-        '../third_party/skia/src/core/SkCordic.cpp',
-        '../third_party/skia/src/core/SkCordic.h',
-        '../third_party/skia/src/core/SkCoreBlitters.h',
-        '../third_party/skia/src/core/SkCubicClipper.cpp',
-        '../third_party/skia/src/core/SkCubicClipper.h',
-        '../third_party/skia/src/core/SkData.cpp',
-        '../third_party/skia/src/core/SkDebug.cpp',
-        #'../third_party/skia/src/core/SkDebug_stdio.cpp',
-        '../third_party/skia/src/core/SkDeque.cpp',
-        '../third_party/skia/src/core/SkDevice.cpp',
-        '../third_party/skia/src/core/SkDither.cpp',
-        '../third_party/skia/src/core/SkDraw.cpp',
-        '../third_party/skia/src/core/SkDrawProcs.h',
-        #'../third_party/skia/src/core/SkDrawing.cpp',
-        '../third_party/skia/src/core/SkEdgeBuilder.cpp',
-        '../third_party/skia/src/core/SkEdgeClipper.cpp',
-        '../third_party/skia/src/core/SkEdge.cpp',
-        '../third_party/skia/src/core/SkEdge.h',
-        '../third_party/skia/src/core/SkFDot6.h',
-        '../third_party/skia/src/core/SkFP.h',
-        '../third_party/skia/src/core/SkFilterProc.cpp',
-        '../third_party/skia/src/core/SkFilterProc.h',
+      'sources': [
+        # this should likely be moved into src/utils in skia
         '../third_party/skia/src/core/SkFlate.cpp',
-        '../third_party/skia/src/core/SkFlattenable.cpp',
-        '../third_party/skia/src/core/SkFlattenableBuffers.cpp',
-        '../third_party/skia/src/core/SkFloat.cpp',
-        '../third_party/skia/src/core/SkFloat.h',
-        '../third_party/skia/src/core/SkFloatBits.cpp',
-        '../third_party/skia/src/core/SkFontHost.cpp',
-        '../third_party/skia/src/core/SkGeometry.cpp',
-        '../third_party/skia/src/core/SkGlyphCache.cpp',
-        '../third_party/skia/src/core/SkGlyphCache.h',
-        '../third_party/skia/src/core/SkGraphics.cpp',
-        '../third_party/skia/src/core/SkInstCnt.cpp',
-        '../third_party/skia/src/core/SkLineClipper.cpp',
-        '../third_party/skia/src/core/SkMMapStream.cpp',
-        '../third_party/skia/src/core/SkMallocPixelRef.cpp',
-        '../third_party/skia/src/core/SkMask.cpp',
-        '../third_party/skia/src/core/SkMaskFilter.cpp',
-        '../third_party/skia/src/core/SkMaskGamma.cpp',
-        '../third_party/skia/src/core/SkMaskGamma.h',
-        '../third_party/skia/src/core/SkMath.cpp',
-        '../third_party/skia/src/core/SkMatrix.cpp',
-        '../third_party/skia/src/core/SkMetaData.cpp',
-        '../third_party/skia/src/core/SkOrderedReadBuffer.cpp',
-        '../third_party/skia/src/core/SkOrderedWriteBuffer.cpp',
-        '../third_party/skia/src/core/SkPackBits.cpp',
-        '../third_party/skia/src/core/SkPaint.cpp',
-        '../third_party/skia/src/core/SkPath.cpp',
-        '../third_party/skia/src/core/SkPathEffect.cpp',
-        '../third_party/skia/src/core/SkPathHeap.cpp',
-        '../third_party/skia/src/core/SkPathHeap.h',
-        '../third_party/skia/src/core/SkPathMeasure.cpp',
-        '../third_party/skia/src/core/SkPerspIter.h',
-        '../third_party/skia/src/core/SkPicture.cpp',
-        '../third_party/skia/src/core/SkPictureFlat.cpp',
-        '../third_party/skia/src/core/SkPictureFlat.h',
-        '../third_party/skia/src/core/SkPicturePlayback.cpp',
-        '../third_party/skia/src/core/SkPicturePlayback.h',
-        '../third_party/skia/src/core/SkPictureRecord.cpp',
-        '../third_party/skia/src/core/SkPictureRecord.h',
-        '../third_party/skia/src/core/SkPixelRef.cpp',
-        '../third_party/skia/src/core/SkPoint.cpp',
-        '../third_party/skia/src/core/SkProcSpriteBlitter.cpp',
-        '../third_party/skia/src/core/SkPtrRecorder.cpp',
-        '../third_party/skia/src/core/SkQuadClipper.cpp',
-        '../third_party/skia/src/core/SkQuadClipper.h',
-        '../third_party/skia/src/core/SkRasterClip.cpp',
-        '../third_party/skia/src/core/SkRasterizer.cpp',
-        '../third_party/skia/src/core/SkRect.cpp',
-        '../third_party/skia/src/core/SkRefCnt.cpp',
-        '../third_party/skia/src/core/SkRefDict.cpp',
-        '../third_party/skia/src/core/SkRegion.cpp',
-        '../third_party/skia/src/core/SkRegionPriv.h',
-        '../third_party/skia/src/core/SkRegion_path.cpp',
-        '../third_party/skia/src/core/SkScalar.cpp',
-        '../third_party/skia/src/core/SkScalerContext.cpp',
-        '../third_party/skia/src/core/SkScan.cpp',
-        '../third_party/skia/src/core/SkScan.h',
-        '../third_party/skia/src/core/SkScanPriv.h',
-        '../third_party/skia/src/core/SkScan_AntiPath.cpp',
-        '../third_party/skia/src/core/SkScan_Antihair.cpp',
-        '../third_party/skia/src/core/SkScan_Hairline.cpp',
-        '../third_party/skia/src/core/SkScan_Path.cpp',
-        '../third_party/skia/src/core/SkShader.cpp',
-        '../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp',
-        '../third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp',
-        '../third_party/skia/src/core/SkSinTable.h',
-        '../third_party/skia/src/core/SkSpriteBlitter.h',
-        '../third_party/skia/src/core/SkSpriteBlitterTemplate.h',
-        '../third_party/skia/src/core/SkStream.cpp',
-        '../third_party/skia/src/core/SkString.cpp',
-        '../third_party/skia/src/core/SkStroke.cpp',
-        '../third_party/skia/src/core/SkStrokerPriv.cpp',
-        '../third_party/skia/src/core/SkStrokerPriv.h',
-        '../third_party/skia/src/core/SkTextFormatParams.h',
-        '../third_party/skia/src/core/SkTLS.cpp',
-        '../third_party/skia/src/core/SkTSearch.cpp',
-        '../third_party/skia/src/core/SkTSort.h',
-        '../third_party/skia/src/core/SkTemplatesPriv.h',
-        '../third_party/skia/src/core/SkTypeface.cpp',
-        '../third_party/skia/src/core/SkTypefaceCache.cpp',
-        '../third_party/skia/src/core/SkUnPreMultiply.cpp',
-        '../third_party/skia/src/core/SkUtils.cpp',
-        '../third_party/skia/src/core/SkWriter32.cpp',
-        '../third_party/skia/src/core/SkXfermode.cpp',
-
-        '../third_party/skia/src/pipe/SkGPipeRead.cpp',
-        '../third_party/skia/src/pipe/SkGPipeWrite.cpp',
 
         '../third_party/skia/src/effects/Sk1DPathEffect.cpp',
         '../third_party/skia/src/effects/Sk2DPathEffect.cpp',
@@ -596,88 +289,6 @@
         '../third_party/skia/include/utils/SkNWayCanvas.h',
         '../third_party/skia/src/utils/SkNWayCanvas.cpp',
 
-        '../third_party/skia/include/core/Sk64.h',
-        '../third_party/skia/include/core/SkAdvancedTypefaceMetrics.h',
-        '../third_party/skia/include/core/SkAnnotation.h',
-        '../third_party/skia/include/core/SkBitmap.h',
-        '../third_party/skia/include/core/SkBlitRow.h',
-        '../third_party/skia/include/core/SkBounder.h',
-        '../third_party/skia/include/core/SkBuffer.h',
-        '../third_party/skia/include/core/SkCanvas.h',
-        '../third_party/skia/include/core/SkChunkAlloc.h',
-        '../third_party/skia/include/core/SkClipStack.h',
-        '../third_party/skia/include/core/SkColor.h',
-        '../third_party/skia/include/core/SkColorFilter.h',
-        '../third_party/skia/include/core/SkColorPriv.h',
-        '../third_party/skia/include/core/SkColorShader.h',
-        '../third_party/skia/include/core/SkComposeShader.h',
-        '../third_party/skia/include/core/SkData.h',
-        '../third_party/skia/include/core/SkDeque.h',
-        '../third_party/skia/include/core/SkDescriptor.h',
-        '../third_party/skia/include/core/SkDevice.h',
-        '../third_party/skia/include/core/SkDither.h',
-        '../third_party/skia/include/core/SkDraw.h',
-        '../third_party/skia/include/core/SkDrawFilter.h',
-        '../third_party/skia/include/core/SkDrawLooper.h',
-        #'../third_party/skia/include/core/SkDrawing.h',
-        '../third_party/skia/include/core/SkEndian.h',
-        '../third_party/skia/include/core/SkFixed.h',
-        '../third_party/skia/include/core/SkFlate.h',
-        '../third_party/skia/include/core/SkFlattenable.h',
-        '../third_party/skia/include/core/SkFloatBits.h',
-        '../third_party/skia/include/core/SkFloatingPoint.h',
-        '../third_party/skia/include/core/SkFontHost.h',
-        '../third_party/skia/include/core/SkGeometry.h',
-        '../third_party/skia/include/core/SkGraphics.h',
-        '../third_party/skia/include/core/SkInstCnt.h',
-        '../third_party/skia/include/core/SkMMapStream.h',
-        '../third_party/skia/include/core/SkMallocPixelRef.h',
-        '../third_party/skia/include/core/SkMask.h',
-        '../third_party/skia/include/core/SkMaskFilter.h',
-        '../third_party/skia/include/core/SkMath.h',
-        '../third_party/skia/include/core/SkMatrix.h',
-        '../third_party/skia/include/core/SkOSFile.h',
-        '../third_party/skia/include/core/SkPackBits.h',
-        '../third_party/skia/include/core/SkPaint.h',
-        '../third_party/skia/include/core/SkPath.h',
-        '../third_party/skia/include/core/SkPathEffect.h',
-        '../third_party/skia/include/core/SkPathMeasure.h',
-        '../third_party/skia/include/core/SkPicture.h',
-        '../third_party/skia/include/core/SkPixelRef.h',
-        '../third_party/skia/include/core/SkPoint.h',
-        '../third_party/skia/include/core/SkPtrRecorder.h',
-        '../third_party/skia/include/core/SkRandom.h',
-        '../third_party/skia/include/core/SkRasterizer.h',
-        '../third_party/skia/include/core/SkReader32.h',
-        '../third_party/skia/include/core/SkRect.h',
-        '../third_party/skia/include/core/SkRefCnt.h',
-        '../third_party/skia/include/core/SkRefDict.h',
-        '../third_party/skia/include/core/SkRegion.h',
-        '../third_party/skia/include/core/SkScalar.h',
-        '../third_party/skia/include/core/SkScalarCompare.h',
-        '../third_party/skia/include/core/SkScalerContext.h',
-        '../third_party/skia/include/core/SkShader.h',
-        '../third_party/skia/include/core/SkStream.h',
-        '../third_party/skia/include/core/SkString.h',
-        '../third_party/skia/include/core/SkTArray.h',
-        '../third_party/skia/include/core/SkTDArray.h',
-        '../third_party/skia/include/core/SkTDStack.h',
-        '../third_party/skia/include/core/SkTDict.h',
-        '../third_party/skia/include/core/SkTRegistry.h',
-        '../third_party/skia/include/core/SkTScopedPtr.h',
-        '../third_party/skia/include/core/SkTSearch.h',
-        '../third_party/skia/include/core/SkTemplates.h',
-        '../third_party/skia/include/core/SkThread.h',
-        '../third_party/skia/include/core/SkThread_platform.h',
-        '../third_party/skia/include/core/SkTime.h',
-        '../third_party/skia/include/core/SkTypeface.h',
-        '../third_party/skia/include/core/SkTypes.h',
-        '../third_party/skia/include/core/SkUnPreMultiply.h',
-        '../third_party/skia/include/core/SkUnitMapper.h',
-        '../third_party/skia/include/core/SkUtils.h',
-        '../third_party/skia/include/core/SkWriter32.h',
-        '../third_party/skia/include/core/SkXfermode.h',
-
         '../third_party/skia/include/effects/Sk1DPathEffect.h',
         '../third_party/skia/include/effects/Sk2DPathEffect.h',
         '../third_party/skia/include/effects/SkAvoidXfermode.h',
@@ -741,8 +352,6 @@
         '../third_party/skia/include/pdf/SkPDFDevice.h',
         '../third_party/skia/include/pdf/SkPDFDocument.h',
 
-        '../third_party/skia/include/pipe/SkGPipe.h',
-
         '../third_party/skia/include/ports/SkStream_Win.h',
         '../third_party/skia/include/ports/SkTypeface_win.h',