gypi -> gni: core, effects, android framework defines

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4023

Change-Id: I29a26c1716a319156a34a64999756ed7dba1e603
Reviewed-on: https://skia-review.googlesource.com/4023
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

4 files changed, 671 insertions, 33 deletions

diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni
new file mode 100644
index 0000000000..7e87131641
--- /dev/null
+++ b/gn/android_framework_defines.gni
@@ -0,0 +1,19 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+android_framework_defines = [
+  "SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT",
+
+  # Needed until we fix https://bug.skia.org/2440 .
+  "SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG",
+  "SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS",
+  "SK_SUPPORT_LEGACY_GRADIENT_DITHERING",
+  "SK_SUPPORT_LEGACY_DRAWFILTER",
+  "SK_IGNORE_GPU_DITHER",
+  "SK_SUPPORT_LEGACY_CLIP_REGIONOPS",
+  "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
+  "SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES",
+  "SK_SUPPORT_LEGACY_SHADER_ASALOCALMATRIXSHADER",
+]
diff --git a/gn/core.gni b/gn/core.gni
new file mode 100644
index 0000000000..5a9d86f6ea
--- /dev/null
+++ b/gn/core.gni
@@ -0,0 +1,527 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Things are easiest for everyone if these source paths are absolute.
+_src = get_path_info("../src", "abspath")
+_include = get_path_info("../include", "abspath")
+
+skia_core_sources = [
+  "$_src/c/sk_paint.cpp",
+  "$_src/c/sk_surface.cpp",
+  "$_src/c/sk_types_priv.h",
+
+  "$_src/core/Sk4px.h",
+  "$_src/core/SkAAClip.cpp",
+  "$_src/core/SkAnnotation.cpp",
+  "$_src/core/SkAdvancedTypefaceMetrics.h",
+  "$_src/core/SkAlphaRuns.cpp",
+  "$_src/core/SkAntiRun.h",
+  "$_src/core/SkATrace.cpp",
+  "$_src/core/SkATrace.h",
+  "$_src/core/SkAutoKern.h",
+  "$_src/core/SkAutoPixmapStorage.h",
+  "$_src/core/SkAutoPixmapStorage.cpp",
+  "$_src/core/SkBBHFactory.cpp",
+  "$_src/core/SkBBoxHierarchy.h",
+  "$_src/core/SkBigPicture.cpp",
+  "$_src/core/SkBitmap.cpp",
+  "$_src/core/SkBitmapCache.cpp",
+  "$_src/core/SkBitmapController.cpp",
+  "$_src/core/SkBitmapDevice.cpp",
+  "$_src/core/SkBitmapFilter.h",
+  "$_src/core/SkBitmapProcShader.cpp",
+  "$_src/core/SkBitmapProcShader.h",
+  "$_src/core/SkBitmapProcState.cpp",
+  "$_src/core/SkBitmapProcState.h",
+  "$_src/core/SkBitmapProcState_filter.h",
+  "$_src/core/SkBitmapProcState_matrix.h",
+  "$_src/core/SkBitmapProcState_matrix_template.h",
+  "$_src/core/SkBitmapProcState_matrixProcs.cpp",
+  "$_src/core/SkBitmapProcState_procs.h",
+  "$_src/core/SkBitmapProcState_sample.h",
+  "$_src/core/SkBitmapProcState_shaderproc.h",
+  "$_src/core/SkBitmapProcState_utils.h",
+  "$_src/core/SkBitmapProvider.cpp",
+  "$_src/core/SkBitmapProvider.h",
+  "$_src/core/SkBitmapScaler.h",
+  "$_src/core/SkBitmapScaler.cpp",
+  "$_src/core/SkBlitBWMaskTemplate.h",
+  "$_src/core/SkBlitMask.h",
+  "$_src/core/SkBlitMask_D32.cpp",
+  "$_src/core/SkBlitRow_D16.cpp",
+  "$_src/core/SkBlitRow_D32.cpp",
+  "$_src/core/SkBlitter.h",
+  "$_src/core/SkBlitter.cpp",
+  "$_src/core/SkBlitter_A8.cpp",
+  "$_src/core/SkBlitter_ARGB32.cpp",
+  "$_src/core/SkBlitter_PM4f.cpp",
+  "$_src/core/SkBlitter_RGB16.cpp",
+  "$_src/core/SkBlitter_Sprite.cpp",
+  "$_src/core/SkBlurImageFilter.cpp",
+  "$_src/core/SkBuffer.cpp",
+  "$_src/core/SkCachedData.cpp",
+  "$_src/core/SkCanvas.cpp",
+  "$_src/core/SkCanvasPriv.h",
+  "$_src/core/SkChunkAlloc.cpp",
+  "$_src/core/SkClipStack.cpp",
+  "$_src/core/SkColor.cpp",
+  "$_src/core/SkColorFilter.cpp",
+  "$_src/core/SkColorFilterShader.cpp",
+  "$_src/core/SkColorMatrixFilterRowMajor255.cpp",
+  "$_src/core/SkColorMatrixFilterRowMajor255.h",
+  "$_src/core/SkColorShader.cpp",
+  "$_src/core/SkColorShader.h",
+  "$_src/core/SkColorSpace.cpp",
+  "$_src/core/SkColorSpace_A2B.cpp",
+  "$_src/core/SkColorSpace_A2B.h",
+  "$_src/core/SkColorSpace_XYZ.cpp",
+  "$_src/core/SkColorSpace_XYZ.h",
+  "$_src/core/SkColorSpace_ICC.cpp",
+  "$_src/core/SkColorSpaceXform.cpp",
+  "$_src/core/SkColorTable.cpp",
+  "$_src/core/SkComposeShader.cpp",
+  "$_src/core/SkConfig8888.cpp",
+  "$_src/core/SkConfig8888.h",
+  "$_src/core/SkConvolver.cpp",
+  "$_src/core/SkConvolver.h",
+  "$_src/core/SkCoreBlitters.h",
+  "$_src/core/SkCpu.cpp",
+  "$_src/core/SkCpu.h",
+  "$_src/core/SkCubicClipper.cpp",
+  "$_src/core/SkCubicClipper.h",
+  "$_src/core/SkData.cpp",
+  "$_src/core/SkDataTable.cpp",
+  "$_src/core/SkDebug.cpp",
+  "$_src/core/SkDeque.cpp",
+  "$_src/core/SkDescriptor.h",
+  "$_src/core/SkDevice.cpp",
+  "$_src/core/SkDeviceLooper.cpp",
+  "$_src/core/SkDeviceProfile.cpp",
+  "$_src/core/SkDiscardableMemory.h",
+  "$_src/lazy/SkDiscardableMemoryPool.cpp",
+  "$_src/core/SkDistanceFieldGen.cpp",
+  "$_src/core/SkDistanceFieldGen.h",
+  "$_src/core/SkDither.cpp",
+  "$_src/core/SkDither.h",
+  "$_src/core/SkDocument.cpp",
+  "$_src/core/SkDraw.cpp",
+  "$_src/core/SkDrawable.cpp",
+  "$_src/core/SkDrawLooper.cpp",
+  "$_src/core/SkDrawProcs.h",
+  "$_src/core/SkEdgeBuilder.cpp",
+  "$_src/core/SkEdgeBuilder.h",
+  "$_src/core/SkEdgeClipper.cpp",
+  "$_src/core/SkEdgeClipper.h",
+  "$_src/core/SkEmptyShader.h",
+  "$_src/core/SkEndian.h",
+  "$_src/core/SkAnalyticEdge.cpp",
+  "$_src/core/SkAAAConstants.h",
+  "$_src/core/SkEdge.cpp",
+  "$_src/core/SkEdge.h",
+  "$_src/core/SkFDot6.h",
+  "$_src/core/SkFilterProc.cpp",
+  "$_src/core/SkFilterProc.h",
+  "$_src/core/SkFindAndPlaceGlyph.h",
+  "$_src/core/SkFlattenable.cpp",
+  "$_src/core/SkFlattenableSerialization.cpp",
+  "$_src/core/SkFont.cpp",
+  "$_src/core/SkFontLCDConfig.cpp",
+  "$_src/core/SkFontMgr.cpp",
+  "$_src/core/SkFontStyle.cpp",
+  "$_src/core/SkFontDescriptor.cpp",
+  "$_src/core/SkFontDescriptor.h",
+  "$_src/core/SkFontStream.cpp",
+  "$_src/core/SkFontStream.h",
+  "$_src/core/SkFuzzLogging.h",
+  "$_src/core/SkGeometry.cpp",
+  "$_src/core/SkGeometry.h",
+  "$_src/core/SkGlobalInitialization_core.cpp",
+  "$_src/core/SkGlyph.h",
+  "$_src/core/SkGlyphCache.cpp",
+  "$_src/core/SkGlyphCache.h",
+  "$_src/core/SkGlyphCache_Globals.h",
+  "$_src/core/SkGpuBlurUtils.h",
+  "$_src/core/SkGpuBlurUtils.cpp",
+  "$_src/core/SkGraphics.cpp",
+  "$_src/core/SkHalf.cpp",
+  "$_src/core/SkHalf.h",
+  "$_src/core/SkImageFilter.cpp",
+  "$_src/core/SkImageFilterCache.cpp",
+  "$_src/core/SkImageFilterCache.h",
+  "$_src/core/SkImageInfo.cpp",
+  "$_src/core/SkImageCacherator.h",
+  "$_src/core/SkImageCacherator.cpp",
+  "$_src/core/SkImageGenerator.cpp",
+  "$_src/core/SkLightingShader.h",
+  "$_src/core/SkLightingShader.cpp",
+  "$_src/core/SkLights.cpp",
+  "$_src/core/SkLinearBitmapPipeline.cpp",
+  "$_src/core/SkLinearBitmapPipeline.h",
+  "$_src/core/SkLinearBitmapPipeline_core.h",
+  "$_src/core/SkLinearBitmapPipeline_matrix.h",
+  "$_src/core/SkLinearBitmapPipeline_tile.h",
+  "$_src/core/SkLinearBitmapPipeline_sample.h",
+  "$_src/core/SkLineClipper.cpp",
+  "$_src/core/SkLiteDL.cpp",
+  "$_src/core/SkLiteRecorder.cpp",
+  "$_src/core/SkLocalMatrixImageFilter.cpp",
+  "$_src/core/SkLocalMatrixImageFilter.h",
+  "$_src/core/SkLocalMatrixShader.cpp",
+  "$_src/core/SkMD5.cpp",
+  "$_src/core/SkMD5.h",
+  "$_src/core/SkMallocPixelRef.cpp",
+  "$_src/core/SkMask.cpp",
+  "$_src/core/SkMaskCache.cpp",
+  "$_src/core/SkMaskFilter.cpp",
+  "$_src/core/SkMaskGamma.cpp",
+  "$_src/core/SkMaskGamma.h",
+  "$_src/core/SkMath.cpp",
+  "$_src/core/SkMathPriv.h",
+  "$_src/core/SkMatrix.cpp",
+  "$_src/core/SkMatrix44.cpp",
+  "$_src/core/SkMatrixImageFilter.cpp",
+  "$_src/core/SkMatrixImageFilter.h",
+  "$_src/core/SkMatrixUtils.h",
+  "$_src/core/SkMessageBus.h",
+  "$_src/core/SkMetaData.cpp",
+  "$_src/core/SkMipMap.cpp",
+  "$_src/core/SkMipMap.h",
+  "$_src/core/SkMiniRecorder.cpp",
+  "$_src/core/SkModeColorFilter.cpp",
+  "$_src/core/SkMultiPictureDraw.cpp",
+  "$_src/core/SkNextID.h",
+  "$_src/core/SkLatticeIter.cpp",
+  "$_src/core/SkLatticeIter.h",
+  "$_src/core/SkNormalBevelSource.cpp",
+  "$_src/core/SkNormalBevelSource.h",
+  "$_src/core/SkNormalMapSource.cpp",
+  "$_src/core/SkNormalMapSource.h",
+  "$_src/core/SkNormalFlatSource.cpp",
+  "$_src/core/SkNormalFlatSource.h",
+  "$_src/core/SkNormalSource.cpp",
+  "$_src/core/SkNormalSource.h",
+  "$_src/core/SkNormalSourcePriv.h",
+  "$_src/core/SkNx.h",
+  "$_src/core/SkOpts.cpp",
+  "$_src/core/SkOpts.h",
+  "$_src/core/SkOrderedReadBuffer.h",
+  "$_src/core/SkPaint.cpp",
+  "$_src/core/SkPaintDefaults.h",
+  "$_src/core/SkPaintPriv.cpp",
+  "$_src/core/SkPaintPriv.h",
+  "$_src/core/SkPath.cpp",
+  "$_src/core/SkPathEffect.cpp",
+  "$_src/core/SkPathMeasure.cpp",
+  "$_src/core/SkPathPriv.h",
+  "$_src/core/SkPathRef.cpp",
+  "$_src/core/SkPerspIter.h",
+  "$_src/core/SkPicture.cpp",
+  "$_src/core/SkPictureAnalyzer.cpp",
+  "$_src/core/SkPictureCommon.h",
+  "$_src/core/SkPictureContentInfo.cpp",
+  "$_src/core/SkPictureContentInfo.h",
+  "$_src/core/SkPictureData.cpp",
+  "$_src/core/SkPictureData.h",
+  "$_src/core/SkPictureFlat.cpp",
+  "$_src/core/SkPictureFlat.h",
+  "$_src/core/SkPictureImageGenerator.cpp",
+  "$_src/core/SkPicturePlayback.cpp",
+  "$_src/core/SkPicturePlayback.h",
+  "$_src/core/SkPictureRecord.cpp",
+  "$_src/core/SkPictureRecord.h",
+  "$_src/core/SkPictureRecorder.cpp",
+  "$_src/core/SkPictureShader.cpp",
+  "$_src/core/SkPictureShader.h",
+  "$_src/core/SkPixelRef.cpp",
+  "$_src/core/SkPixmap.cpp",
+  "$_src/core/SkPoint.cpp",
+  "$_src/core/SkPoint3.cpp",
+  "$_src/core/SkPtrRecorder.cpp",
+  "$_src/core/SkQuadClipper.cpp",
+  "$_src/core/SkQuadClipper.h",
+  "$_src/core/SkRadialShadowMapShader.cpp",
+  "$_src/core/SkRadialShadowMapShader.h",
+  "$_src/core/SkRasterClip.cpp",
+  "$_src/core/SkRasterPipeline.cpp",
+  "$_src/core/SkRasterPipelineBlitter.cpp",
+  "$_src/core/SkRasterizer.cpp",
+  "$_src/core/SkReadBuffer.h",
+  "$_src/core/SkReadBuffer.cpp",
+  "$_src/core/SkReader32.h",
+  "$_src/core/SkRecord.cpp",
+  "$_src/core/SkRecords.cpp",
+  "$_src/core/SkRecordDraw.cpp",
+  "$_src/core/SkRecordOpts.cpp",
+  "$_src/core/SkRecordOpts.h",
+  "$_src/core/SkRecordPattern.h",
+  "$_src/core/SkRecordedDrawable.cpp",
+  "$_src/core/SkRecorder.cpp",
+  "$_src/core/SkRect.cpp",
+  "$_src/core/SkRefDict.cpp",
+  "$_src/core/SkRegion.cpp",
+  "$_src/core/SkRegionPriv.h",
+  "$_src/core/SkRegion_path.cpp",
+  "$_src/core/SkResourceCache.cpp",
+  "$_src/core/SkRRect.cpp",
+  "$_src/core/SkRTree.h",
+  "$_src/core/SkRTree.cpp",
+  "$_src/core/SkRWBuffer.cpp",
+  "$_src/core/SkScalar.cpp",
+  "$_src/core/SkScalerContext.cpp",
+  "$_src/core/SkScalerContext.h",
+  "$_src/core/SkScan.cpp",
+  "$_src/core/SkScan.h",
+  "$_src/core/SkScanPriv.h",
+  "$_src/core/SkScan_AAAPath.cpp",
+  "$_src/core/SkScan_AntiPath.cpp",
+  "$_src/core/SkScan_Antihair.cpp",
+  "$_src/core/SkScan_Hairline.cpp",
+  "$_src/core/SkScan_Path.cpp",
+  "$_src/core/SkSemaphore.cpp",
+  "$_src/core/SkShader.cpp",
+  "$_src/core/SkSharedMutex.cpp",
+  "$_src/core/SkSharedMutex.h",
+  "$_src/core/SkSinglyLinkedList.h",
+  "$_src/core/SkSmallAllocator.h",
+  "$_src/core/SkSpanProcs.cpp",
+  "$_src/core/SkSpecialImage.cpp",
+  "$_src/core/SkSpecialImage.h",
+  "$_src/core/SkSpecialSurface.cpp",
+  "$_src/core/SkSpecialSurface.h",
+  "$_src/core/SkSpinlock.cpp",
+  "$_src/core/SkSpriteBlitter_ARGB32.cpp",
+  "$_src/core/SkSpriteBlitter_RGB16.cpp",
+  "$_src/core/SkSpriteBlitter.h",
+  "$_src/core/SkSpriteBlitterTemplate.h",
+  "$_src/core/SkSpriteBlitter4f.cpp",
+  "$_src/core/SkStream.cpp",
+  "$_src/core/SkStreamPriv.h",
+  "$_src/core/SkString.cpp",
+  "$_src/core/SkStringUtils.cpp",
+  "$_src/core/SkStroke.h",
+  "$_src/core/SkStroke.cpp",
+  "$_src/core/SkStrokeRec.cpp",
+  "$_src/core/SkStrokerPriv.cpp",
+  "$_src/core/SkStrokerPriv.h",
+  "$_src/core/SkSurfacePriv.h",
+  "$_src/core/SkSwizzle.cpp",
+  "$_src/core/SkSRGB.cpp",
+  "$_src/core/SkTaskGroup.cpp",
+  "$_src/core/SkTaskGroup.h",
+  "$_src/core/SkTDPQueue.h",
+  "$_src/core/SkTDynamicHash.h",
+  "$_src/core/SkTInternalLList.h",
+  "$_src/core/SkTextBlob.cpp",
+  "$_src/core/SkTextFormatParams.h",
+  "$_src/core/SkTextMapStateProc.h",
+  "$_src/core/SkTextToPathIter.h",
+  "$_src/core/SkTime.cpp",
+  "$_src/core/SkTDPQueue.h",
+  "$_src/core/SkThreadID.cpp",
+  "$_src/core/SkTLList.h",
+  "$_src/core/SkTLS.cpp",
+  "$_src/core/SkTMultiMap.h",
+  "$_src/core/SkTraceEvent.h",
+  "$_src/core/SkTraceEventCommon.h",
+  "$_src/core/SkTSearch.cpp",
+  "$_src/core/SkTSort.h",
+  "$_src/core/SkTTopoSort.h",
+  "$_src/core/SkTypeface.cpp",
+  "$_src/core/SkTypefaceCache.cpp",
+  "$_src/core/SkTypefaceCache.h",
+  "$_src/core/SkTypefacePriv.h",
+  "$_src/core/SkUnPreMultiply.cpp",
+  "$_src/core/SkUtils.cpp",
+  "$_src/core/SkUtils.h",
+  "$_src/core/SkValidatingReadBuffer.cpp",
+  "$_src/core/SkValidatingReadBuffer.h",
+  "$_src/core/SkValidationUtils.h",
+  "$_src/core/SkVarAlloc.cpp",
+  "$_src/core/SkVertState.cpp",
+  "$_src/core/SkWriteBuffer.cpp",
+  "$_src/core/SkWriter32.cpp",
+  "$_src/core/SkXfermode.cpp",
+  "$_src/core/SkXfermode4f.cpp",
+  "$_src/core/SkXfermodeF16.cpp",
+  "$_src/core/SkXfermode_proccoeff.h",
+  "$_src/core/SkXfermodeInterpretation.cpp",
+  "$_src/core/SkXfermodeInterpretation.h",
+  "$_src/core/SkYUVPlanesCache.cpp",
+  "$_src/core/SkYUVPlanesCache.h",
+  "$_src/core/SkShadowShader.cpp",
+  "$_src/core/SkShadowShader.h",
+
+  "$_src/image/SkImage.cpp",
+  "$_src/image/SkImage_Generator.cpp",
+
+  #        "$_src/image/SkImage_Gpu.cpp",
+  "$_src/image/SkImage_Raster.cpp",
+  "$_src/image/SkImageShader.cpp",
+  "$_src/image/SkImageShader.h",
+  "$_src/image/SkSurface.cpp",
+  "$_src/image/SkSurface_Base.h",
+
+  #        "$_src/image/SkSurface_Gpu.cpp",
+  "$_src/image/SkSurface_Raster.cpp",
+
+  "$_src/pipe/SkPipeCanvas.cpp",
+  "$_src/pipe/SkPipeReader.cpp",
+
+  "$_include/core/SkBBHFactory.h",
+  "$_include/core/SkBitmap.h",
+  "$_include/core/SkBitmapDevice.h",
+  "$_include/core/SkBlitRow.h",
+  "$_include/core/SkCanvas.h",
+  "$_include/core/SkChunkAlloc.h",
+  "$_include/core/SkClipStack.h",
+  "$_include/core/SkColor.h",
+  "$_include/core/SkColorFilter.h",
+  "$_include/core/SkColorPriv.h",
+  "$_include/core/SkData.h",
+  "$_include/core/SkDeque.h",
+  "$_include/core/SkDevice.h",
+  "$_include/core/SkDraw.h",
+  "$_include/core/SkDrawable.h",
+  "$_include/core/SkDrawFilter.h",
+  "$_include/core/SkDrawLooper.h",
+  "$_include/core/SkFlattenable.h",
+  "$_include/core/SkFlattenableSerialization.h",
+  "$_include/core/SkFontLCDConfig.h",
+  "$_include/core/SkFontStyle.h",
+  "$_include/core/SkGraphics.h",
+  "$_include/core/SkImage.h",
+  "$_include/core/SkImageEncoder.h",
+  "$_include/core/SkImageFilter.h",
+  "$_include/core/SkImageInfo.h",
+  "$_include/core/SkLights.h",
+  "$_include/core/SkMallocPixelRef.h",
+  "$_include/core/SkMask.h",
+  "$_include/core/SkMaskFilter.h",
+  "$_include/core/SkMath.h",
+  "$_include/core/SkMatrix.h",
+  "$_include/core/SkMatrix44.h",
+  "$_include/core/SkMetaData.h",
+  "$_include/core/SkMultiPictureDraw.h",
+  "$_include/core/SkOSFile.h",
+  "$_include/core/SkPaint.h",
+  "$_include/core/SkPath.h",
+  "$_include/core/SkPathEffect.h",
+  "$_include/core/SkPathMeasure.h",
+  "$_include/core/SkPathRef.h",
+  "$_include/core/SkPicture.h",
+  "$_include/core/SkPictureAnalyzer.h",
+  "$_include/core/SkPictureRecorder.h",
+  "$_include/core/SkPixelRef.h",
+  "$_include/core/SkPoint.h",
+  "$_include/core/SkPoint3.h",
+  "$_include/core/SkPreConfig.h",
+  "$_include/core/SkRasterizer.h",
+  "$_include/core/SkRect.h",
+  "$_include/core/SkRefCnt.h",
+  "$_include/core/SkRegion.h",
+  "$_include/core/SkRRect.h",
+  "$_include/core/SkScalar.h",
+  "$_include/core/SkShader.h",
+  "$_include/core/SkStream.h",
+  "$_include/core/SkString.h",
+  "$_include/core/SkStrokeRec.h",
+  "$_include/core/SkSurface.h",
+  "$_include/core/SkSwizzle.h",
+  "$_include/core/SkTRegistry.h",
+  "$_include/core/SkTextBlob.h",
+  "$_include/core/SkTime.h",
+  "$_include/core/SkTLazy.h",
+  "$_include/core/SkTypeface.h",
+  "$_include/core/SkTypes.h",
+  "$_include/core/SkUnPreMultiply.h",
+  "$_include/core/SkWriter32.h",
+  "$_include/core/SkXfermode.h",
+
+  # private
+  "$_include/private/SkAtomics.h",
+  "$_include/private/SkChecksum.h",
+  "$_include/private/SkFixed.h",
+  "$_include/private/SkFloatBits.h",
+  "$_include/private/SkFloatingPoint.h",
+  "$_include/private/SkMiniRecorder.h",
+  "$_include/private/SkMutex.h",
+  "$_include/private/SkOnce.h",
+  "$_include/private/SkRecords.h",
+  "$_include/private/SkSemaphore.h",
+  "$_include/private/SkShadowParams.h",
+  "$_include/private/SkSpinlock.h",
+  "$_include/private/SkTemplates.h",
+  "$_include/private/SkTArray.h",
+  "$_include/private/SkTDArray.h",
+  "$_include/private/SkTFitsIn.h",
+  "$_include/private/SkTHash.h",
+  "$_include/private/SkThreadID.h",
+  "$_include/private/SkTDict.h",
+  "$_include/private/SkTSearch.h",
+  "$_include/private/SkTLogic.h",
+  "$_include/private/SkWeakRefCnt.h",
+
+  # Path ops
+  "$_include/pathops/SkPathOps.h",
+
+  "$_src/pathops/SkAddIntersections.cpp",
+  "$_src/pathops/SkDConicLineIntersection.cpp",
+  "$_src/pathops/SkDCubicLineIntersection.cpp",
+  "$_src/pathops/SkDCubicToQuads.cpp",
+  "$_src/pathops/SkDLineIntersection.cpp",
+  "$_src/pathops/SkDQuadLineIntersection.cpp",
+  "$_src/pathops/SkIntersections.cpp",
+  "$_src/pathops/SkOpAngle.cpp",
+  "$_src/pathops/SkOpBuilder.cpp",
+  "$_src/pathops/SkOpCoincidence.cpp",
+  "$_src/pathops/SkOpContour.cpp",
+  "$_src/pathops/SkOpCubicHull.cpp",
+  "$_src/pathops/SkOpEdgeBuilder.cpp",
+  "$_src/pathops/SkOpSegment.cpp",
+  "$_src/pathops/SkOpSpan.cpp",
+  "$_src/pathops/SkPathOpsCommon.cpp",
+  "$_src/pathops/SkPathOpsConic.cpp",
+  "$_src/pathops/SkPathOpsCubic.cpp",
+  "$_src/pathops/SkPathOpsCurve.cpp",
+  "$_src/pathops/SkPathOpsDebug.cpp",
+  "$_src/pathops/SkPathOpsLine.cpp",
+  "$_src/pathops/SkPathOpsOp.cpp",
+  "$_src/pathops/SkPathOpsPoint.cpp",
+  "$_src/pathops/SkPathOpsQuad.cpp",
+  "$_src/pathops/SkPathOpsRect.cpp",
+  "$_src/pathops/SkPathOpsSimplify.cpp",
+  "$_src/pathops/SkPathOpsTSect.cpp",
+  "$_src/pathops/SkPathOpsTightBounds.cpp",
+  "$_src/pathops/SkPathOpsTypes.cpp",
+  "$_src/pathops/SkPathOpsWinding.cpp",
+  "$_src/pathops/SkPathWriter.cpp",
+  "$_src/pathops/SkReduceOrder.cpp",
+
+  "$_src/pathops/SkAddIntersections.h",
+  "$_src/pathops/SkIntersectionHelper.h",
+  "$_src/pathops/SkIntersections.h",
+  "$_src/pathops/SkLineParameters.h",
+  "$_src/pathops/SkOpAngle.h",
+  "$_src/pathops/SkOpCoincidence.h",
+  "$_src/pathops/SkOpContour.h",
+  "$_src/pathops/SkOpEdgeBuilder.h",
+  "$_src/pathops/SkOpSegment.h",
+  "$_src/pathops/SkOpSpan.h",
+  "$_src/pathops/SkOpTAllocator.h",
+  "$_src/pathops/SkPathOpsBounds.h",
+  "$_src/pathops/SkPathOpsCommon.h",
+  "$_src/pathops/SkPathOpsConic.h",
+  "$_src/pathops/SkPathOpsCubic.h",
+  "$_src/pathops/SkPathOpsCurve.h",
+  "$_src/pathops/SkPathOpsDebug.h",
+  "$_src/pathops/SkPathOpsLine.h",
+  "$_src/pathops/SkPathOpsPoint.h",
+  "$_src/pathops/SkPathOpsQuad.h",
+  "$_src/pathops/SkPathOpsRect.h",
+  "$_src/pathops/SkPathOpsTSect.h",
+  "$_src/pathops/SkPathOpsTypes.h",
+  "$_src/pathops/SkPathWriter.h",
+  "$_src/pathops/SkReduceOrder.h",
+]
diff --git a/gn/effects.gni b/gn/effects.gni
new file mode 100644
index 0000000000..bfa391895b
--- /dev/null
+++ b/gn/effects.gni
@@ -0,0 +1,123 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Things are easiest for everyone if these source paths are absolute.
+_src = get_path_info("../src", "abspath")
+_include = get_path_info("../include", "abspath")
+
+skia_effects_sources = [
+  "$_src/effects/GrCircleBlurFragmentProcessor.cpp",
+  "$_src/effects/GrCircleBlurFragmentProcessor.h",
+  "$_src/effects/GrAlphaThresholdFragmentProcessor.cpp",
+  "$_src/effects/GrAlphaThresholdFragmentProcessor.h",
+
+  "$_src/effects/Sk1DPathEffect.cpp",
+  "$_src/effects/Sk2DPathEffect.cpp",
+  "$_src/effects/SkAlphaThresholdFilter.cpp",
+  "$_src/effects/SkArcToPathEffect.cpp",
+  "$_src/effects/SkArithmeticMode.cpp",
+  "$_src/effects/SkArithmeticMode_gpu.cpp",
+  "$_src/effects/SkArithmeticMode_gpu.h",
+  "$_src/effects/SkBlurDrawLooper.cpp",
+  "$_src/effects/SkBlurMask.cpp",
+  "$_src/effects/SkBlurMask.h",
+  "$_src/effects/SkBlurMaskFilter.cpp",
+  "$_src/effects/SkColorCubeFilter.cpp",
+  "$_src/effects/SkColorFilterImageFilter.cpp",
+  "$_src/effects/SkColorMatrix.cpp",
+  "$_src/effects/SkColorMatrixFilter.cpp",
+  "$_src/effects/SkComposeImageFilter.cpp",
+  "$_src/effects/SkCornerPathEffect.cpp",
+  "$_src/effects/SkDashPathEffect.cpp",
+  "$_src/effects/SkDiscretePathEffect.cpp",
+  "$_src/effects/SkDisplacementMapEffect.cpp",
+  "$_src/effects/SkDropShadowImageFilter.cpp",
+  "$_src/effects/SkEmbossMask.cpp",
+  "$_src/effects/SkEmbossMask.h",
+  "$_src/effects/SkEmbossMask_Table.h",
+  "$_src/effects/SkEmbossMaskFilter.cpp",
+  "$_src/effects/SkImageSource.cpp",
+  "$_src/effects/SkGammaColorFilter.cpp",
+  "$_src/effects/SkGaussianEdgeShader.cpp",
+  "$_src/effects/SkLayerDrawLooper.cpp",
+  "$_src/effects/SkLayerRasterizer.cpp",
+  "$_src/effects/SkLightingImageFilter.cpp",
+  "$_src/effects/SkLumaColorFilter.cpp",
+  "$_src/effects/SkMagnifierImageFilter.cpp",
+  "$_src/effects/SkMatrixConvolutionImageFilter.cpp",
+  "$_src/effects/SkMergeImageFilter.cpp",
+  "$_src/effects/SkMorphologyImageFilter.cpp",
+  "$_src/effects/SkOffsetImageFilter.cpp",
+  "$_src/effects/SkPackBits.cpp",
+  "$_src/effects/SkPackBits.h",
+  "$_src/effects/SkPaintFlagsDrawFilter.cpp",
+  "$_src/effects/SkPaintImageFilter.cpp",
+  "$_src/effects/SkPerlinNoiseShader.cpp",
+  "$_src/effects/SkPictureImageFilter.cpp",
+  "$_src/effects/SkRRectsGaussianEdgeMaskFilter.cpp",
+  "$_src/effects/SkTableColorFilter.cpp",
+  "$_src/effects/SkTableMaskFilter.cpp",
+  "$_src/effects/SkTileImageFilter.cpp",
+  "$_src/effects/SkXfermodeImageFilter.cpp",
+
+  "$_src/effects/gradients/Sk4fGradientBase.cpp",
+  "$_src/effects/gradients/Sk4fGradientBase.h",
+  "$_src/effects/gradients/Sk4fGradientPriv.h",
+  "$_src/effects/gradients/Sk4fLinearGradient.cpp",
+  "$_src/effects/gradients/Sk4fLinearGradient.h",
+  "$_src/effects/gradients/SkClampRange.cpp",
+  "$_src/effects/gradients/SkClampRange.h",
+  "$_src/effects/gradients/SkGradientBitmapCache.cpp",
+  "$_src/effects/gradients/SkGradientBitmapCache.h",
+  "$_src/effects/gradients/SkGradientShader.cpp",
+  "$_src/effects/gradients/SkGradientShaderPriv.h",
+  "$_src/effects/gradients/SkLinearGradient.cpp",
+  "$_src/effects/gradients/SkLinearGradient.h",
+  "$_src/effects/gradients/SkRadialGradient.cpp",
+  "$_src/effects/gradients/SkRadialGradient.h",
+  "$_src/effects/gradients/SkTwoPointConicalGradient.cpp",
+  "$_src/effects/gradients/SkTwoPointConicalGradient.h",
+  "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp",
+  "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.h",
+  "$_src/effects/gradients/SkSweepGradient.cpp",
+  "$_src/effects/gradients/SkSweepGradient.h",
+
+  "$_include/effects/Sk1DPathEffect.h",
+  "$_include/effects/Sk2DPathEffect.h",
+  "$_include/effects/SkAlphaThresholdFilter.h",
+  "$_include/effects/SkArithmeticMode.h",
+  "$_include/effects/SkBlurDrawLooper.h",
+  "$_include/effects/SkBlurImageFilter.h",
+  "$_include/effects/SkBlurMaskFilter.h",
+  "$_include/effects/SkColorCubeFilter.h",
+  "$_include/effects/SkColorFilterImageFilter.h",
+  "$_include/effects/SkColorMatrix.h",
+  "$_include/effects/SkColorMatrixFilter.h",
+  "$_include/effects/SkCornerPathEffect.h",
+  "$_include/effects/SkDashPathEffect.h",
+  "$_include/effects/SkDiscretePathEffect.h",
+  "$_include/effects/SkDisplacementMapEffect.h",
+  "$_include/effects/SkDropShadowImageFilter.h",
+  "$_include/effects/SkEmbossMaskFilter.h",
+  "$_include/effects/SkGammaColorFilter.h",
+  "$_include/effects/SkGaussianEdgeShader.h",
+  "$_include/effects/SkGradientShader.h",
+  "$_include/effects/SkImageSource.h",
+  "$_include/effects/SkLayerDrawLooper.h",
+  "$_include/effects/SkLayerRasterizer.h",
+  "$_include/effects/SkLightingImageFilter.h",
+  "$_include/effects/SkLumaColorFilter.h",
+  "$_include/effects/SkMagnifierImageFilter.h",
+  "$_include/effects/SkMorphologyImageFilter.h",
+  "$_include/effects/SkOffsetImageFilter.h",
+  "$_include/effects/SkPaintFlagsDrawFilter.h",
+  "$_include/effects/SkPaintImageFilter.h",
+  "$_include/effects/SkPerlinNoiseShader.h",
+  "$_include/effects/SkRRectsGaussianEdgeMaskFilter.h",
+  "$_include/effects/SkTableColorFilter.h",
+  "$_include/effects/SkTableMaskFilter.h",
+  "$_include/effects/SkTileImageFilter.h",
+  "$_include/effects/SkXfermodeImageFilter.h",
+]
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 067c1ede2c..0796095212 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -10,29 +10,6 @@
 _path_to_include = get_path_info("../include", "abspath")
 _path_to_src = get_path_info("../src", "abspath")
 
-# Core.
-_core_gypi = exec_script("gypi_to_gn.py",
-                         [
-                           rebase_path("../gyp/core.gypi"),
-                           "--replace=<(skia_include_path)=$_path_to_include",
-                           "--replace=<(skia_src_path)=$_path_to_src",
-                         ],
-                         "scope",
-                         [ "../gyp/core.gypi" ])
-skia_core_sources = _core_gypi.sources
-
-# Effects.
-_effects_gypi =
-    exec_script("gypi_to_gn.py",
-                [
-                  rebase_path("../gyp/effects.gypi"),
-                  "--replace=<(skia_include_path)=$_path_to_include",
-                  "--replace=<(skia_src_path)=$_path_to_src",
-                ],
-                "scope",
-                [ "../gyp/effects.gypi" ])
-skia_effects_sources = _effects_gypi.sources
-
 # GPU.
 _gpu_gypi = exec_script("gypi_to_gn.py",
                         [
@@ -58,7 +35,8 @@ skia_opts = exec_script("gypi_to_gn.py",
                         ],
                         "scope",
                         [ "../gyp/opts.gypi" ])
-
+import("core.gni")
+import("effects.gni")
 import("pdf.gni")
 import("sksl.gni")
 import("utils.gni")
@@ -66,12 +44,3 @@ import("utils.gni")
 # Skia Chromium defines. These flags will be defined in chromium If these
 # become 'permanent', they should be moved into Chrome's skia build file.
 skia_for_chromium_defines = [ "SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS" ]
-
-_android_framework_defines =
-    exec_script(
-        "gypi_to_gn.py",
-        [ rebase_path("../gyp/skia_for_android_framework_defines.gypi") ],
-        "scope",
-        [ "../gyp/core.gypi" ])
-skia_android_framework_defines =
-    _android_framework_defines.skia_for_android_framework_defines