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>

6 files changed, 3 insertions, 698 deletions

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 62dba4b722..dd51277ecf 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -400,11 +400,8 @@
       # specifically requested. These should be temporary staging defines. Any
       # permanent defines should be moved into the skia_android_framework block
       # above.
-      'includes' : [
-        'skia_for_android_framework_defines.gypi',
-      ],
       'defines': [
-        '<@(skia_for_android_framework_defines)',
+        '<!@(python read_gni.py ../gn/android_framework_defines.gni android_framework_defines)'
       ],
     }],
 
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 8077778350..0fbc56cc2d 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -12,10 +12,6 @@
       'standalone_static_library': 1,
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
 
-      'includes': [
-        'core.gypi',
-      ],
-
       'include_dirs': [
         '../include/c',
         '../include/config',
@@ -33,7 +29,7 @@
         '../src/utils',
       ],
       'sources': [
-        'core.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
+        '<!@(python read_gni.py ../gn/core.gni skia_core_sources)',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'conditions': [
diff --git a/gyp/core.gypi b/gyp/core.gypi
deleted file mode 100644
index 6feb77fd97..0000000000
--- a/gyp/core.gypi
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Include this gypi to include all 'core' files
-# The parent gyp/gypi file must define
-#       'skia_src_path'     e.g. skia/trunk/src
-#       'skia_include_path' e.g. skia/trunk/include
-#
-# The skia build defines these in common_variables.gypi
-#
-{
-    'sources': [
-        '<(skia_src_path)/c/sk_paint.cpp',
-        '<(skia_src_path)/c/sk_surface.cpp',
-        '<(skia_src_path)/c/sk_types_priv.h',
-
-        '<(skia_src_path)/core/Sk4px.h',
-        '<(skia_src_path)/core/SkAAClip.cpp',
-        '<(skia_src_path)/core/SkAnnotation.cpp',
-        '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.h',
-        '<(skia_src_path)/core/SkAlphaRuns.cpp',
-        '<(skia_src_path)/core/SkAntiRun.h',
-        '<(skia_src_path)/core/SkATrace.cpp',
-        '<(skia_src_path)/core/SkATrace.h',
-        '<(skia_src_path)/core/SkAutoKern.h',
-        '<(skia_src_path)/core/SkAutoPixmapStorage.h',
-        '<(skia_src_path)/core/SkAutoPixmapStorage.cpp',
-        '<(skia_src_path)/core/SkBBHFactory.cpp',
-        '<(skia_src_path)/core/SkBBoxHierarchy.h',
-        '<(skia_src_path)/core/SkBigPicture.cpp',
-        '<(skia_src_path)/core/SkBitmap.cpp',
-        '<(skia_src_path)/core/SkBitmapCache.cpp',
-        '<(skia_src_path)/core/SkBitmapController.cpp',
-        '<(skia_src_path)/core/SkBitmapDevice.cpp',
-        '<(skia_src_path)/core/SkBitmapFilter.h',
-        '<(skia_src_path)/core/SkBitmapProcShader.cpp',
-        '<(skia_src_path)/core/SkBitmapProcShader.h',
-        '<(skia_src_path)/core/SkBitmapProcState.cpp',
-        '<(skia_src_path)/core/SkBitmapProcState.h',
-        '<(skia_src_path)/core/SkBitmapProcState_filter.h',
-        '<(skia_src_path)/core/SkBitmapProcState_matrix.h',
-        '<(skia_src_path)/core/SkBitmapProcState_matrix_template.h',
-        '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp',
-        '<(skia_src_path)/core/SkBitmapProcState_procs.h',
-        '<(skia_src_path)/core/SkBitmapProcState_sample.h',
-        '<(skia_src_path)/core/SkBitmapProcState_shaderproc.h',
-        '<(skia_src_path)/core/SkBitmapProcState_utils.h',
-        '<(skia_src_path)/core/SkBitmapProvider.cpp',
-        '<(skia_src_path)/core/SkBitmapProvider.h',
-        '<(skia_src_path)/core/SkBitmapScaler.h',
-        '<(skia_src_path)/core/SkBitmapScaler.cpp',
-        '<(skia_src_path)/core/SkBlitBWMaskTemplate.h',
-        '<(skia_src_path)/core/SkBlitMask.h',
-        '<(skia_src_path)/core/SkBlitMask_D32.cpp',
-        '<(skia_src_path)/core/SkBlitRow_D16.cpp',
-        '<(skia_src_path)/core/SkBlitRow_D32.cpp',
-        '<(skia_src_path)/core/SkBlitter.h',
-        '<(skia_src_path)/core/SkBlitter.cpp',
-        '<(skia_src_path)/core/SkBlitter_A8.cpp',
-        '<(skia_src_path)/core/SkBlitter_ARGB32.cpp',
-        '<(skia_src_path)/core/SkBlitter_PM4f.cpp',
-        '<(skia_src_path)/core/SkBlitter_RGB16.cpp',
-        '<(skia_src_path)/core/SkBlitter_Sprite.cpp',
-        '<(skia_src_path)/core/SkBlurImageFilter.cpp',
-        '<(skia_src_path)/core/SkBuffer.cpp',
-        '<(skia_src_path)/core/SkCachedData.cpp',
-        '<(skia_src_path)/core/SkCanvas.cpp',
-        '<(skia_src_path)/core/SkCanvasPriv.h',
-        '<(skia_src_path)/core/SkChunkAlloc.cpp',
-        '<(skia_src_path)/core/SkClipStack.cpp',
-        '<(skia_src_path)/core/SkColor.cpp',
-        '<(skia_src_path)/core/SkColorFilter.cpp',
-        '<(skia_src_path)/core/SkColorFilterShader.cpp',
-        '<(skia_src_path)/core/SkColorMatrixFilterRowMajor255.cpp',
-        '<(skia_src_path)/core/SkColorMatrixFilterRowMajor255.h',
-        '<(skia_src_path)/core/SkColorShader.cpp',
-        '<(skia_src_path)/core/SkColorShader.h',
-        '<(skia_src_path)/core/SkColorSpace.cpp',
-        '<(skia_src_path)/core/SkColorSpace_A2B.cpp',
-        '<(skia_src_path)/core/SkColorSpace_A2B.h',
-        '<(skia_src_path)/core/SkColorSpace_XYZ.cpp',
-        '<(skia_src_path)/core/SkColorSpace_XYZ.h',
-        '<(skia_src_path)/core/SkColorSpace_ICC.cpp',
-        '<(skia_src_path)/core/SkColorSpaceXform.cpp',
-        '<(skia_src_path)/core/SkColorTable.cpp',
-        '<(skia_src_path)/core/SkComposeShader.cpp',
-        '<(skia_src_path)/core/SkConfig8888.cpp',
-        '<(skia_src_path)/core/SkConfig8888.h',
-        '<(skia_src_path)/core/SkConvolver.cpp',
-        '<(skia_src_path)/core/SkConvolver.h',
-        '<(skia_src_path)/core/SkCoreBlitters.h',
-        '<(skia_src_path)/core/SkCpu.cpp',
-        '<(skia_src_path)/core/SkCpu.h',
-        '<(skia_src_path)/core/SkCubicClipper.cpp',
-        '<(skia_src_path)/core/SkCubicClipper.h',
-        '<(skia_src_path)/core/SkData.cpp',
-        '<(skia_src_path)/core/SkDataTable.cpp',
-        '<(skia_src_path)/core/SkDebug.cpp',
-        '<(skia_src_path)/core/SkDeque.cpp',
-        '<(skia_src_path)/core/SkDescriptor.h',
-        '<(skia_src_path)/core/SkDevice.cpp',
-        '<(skia_src_path)/core/SkDeviceLooper.cpp',
-        '<(skia_src_path)/core/SkDeviceProfile.cpp',
-        '<(skia_src_path)/core/SkDiscardableMemory.h',
-        '<(skia_src_path)/lazy/SkDiscardableMemoryPool.cpp',
-        '<(skia_src_path)/core/SkDistanceFieldGen.cpp',
-        '<(skia_src_path)/core/SkDistanceFieldGen.h',
-        '<(skia_src_path)/core/SkDither.cpp',
-        '<(skia_src_path)/core/SkDither.h',
-        '<(skia_src_path)/core/SkDocument.cpp',
-        '<(skia_src_path)/core/SkDraw.cpp',
-        '<(skia_src_path)/core/SkDrawable.cpp',
-        '<(skia_src_path)/core/SkDrawLooper.cpp',
-        '<(skia_src_path)/core/SkDrawProcs.h',
-        '<(skia_src_path)/core/SkEdgeBuilder.cpp',
-        '<(skia_src_path)/core/SkEdgeBuilder.h',
-        '<(skia_src_path)/core/SkEdgeClipper.cpp',
-        '<(skia_src_path)/core/SkEdgeClipper.h',
-        '<(skia_src_path)/core/SkEmptyShader.h',
-        '<(skia_src_path)/core/SkEndian.h',
-        '<(skia_src_path)/core/SkAnalyticEdge.cpp',
-        '<(skia_src_path)/core/SkAAAConstants.h',
-        '<(skia_src_path)/core/SkEdge.cpp',
-        '<(skia_src_path)/core/SkEdge.h',
-        '<(skia_src_path)/core/SkFDot6.h',
-        '<(skia_src_path)/core/SkFilterProc.cpp',
-        '<(skia_src_path)/core/SkFilterProc.h',
-        '<(skia_src_path)/core/SkFindAndPlaceGlyph.h',
-        '<(skia_src_path)/core/SkFlattenable.cpp',
-        '<(skia_src_path)/core/SkFlattenableSerialization.cpp',
-        '<(skia_src_path)/core/SkFont.cpp',
-        '<(skia_src_path)/core/SkFontLCDConfig.cpp',
-        '<(skia_src_path)/core/SkFontMgr.cpp',
-        '<(skia_src_path)/core/SkFontStyle.cpp',
-        '<(skia_src_path)/core/SkFontDescriptor.cpp',
-        '<(skia_src_path)/core/SkFontDescriptor.h',
-        '<(skia_src_path)/core/SkFontStream.cpp',
-        '<(skia_src_path)/core/SkFontStream.h',
-        '<(skia_src_path)/core/SkFuzzLogging.h',
-        '<(skia_src_path)/core/SkGeometry.cpp',
-        '<(skia_src_path)/core/SkGeometry.h',
-        '<(skia_src_path)/core/SkGlobalInitialization_core.cpp',
-        '<(skia_src_path)/core/SkGlyph.h',
-        '<(skia_src_path)/core/SkGlyphCache.cpp',
-        '<(skia_src_path)/core/SkGlyphCache.h',
-        '<(skia_src_path)/core/SkGlyphCache_Globals.h',
-        '<(skia_src_path)/core/SkGpuBlurUtils.h',
-        '<(skia_src_path)/core/SkGpuBlurUtils.cpp',
-        '<(skia_src_path)/core/SkGraphics.cpp',
-        '<(skia_src_path)/core/SkHalf.cpp',
-        '<(skia_src_path)/core/SkHalf.h',
-        '<(skia_src_path)/core/SkImageFilter.cpp',
-        '<(skia_src_path)/core/SkImageFilterCache.cpp',
-        '<(skia_src_path)/core/SkImageFilterCache.h',
-        '<(skia_src_path)/core/SkImageInfo.cpp',
-        '<(skia_src_path)/core/SkImageCacherator.h',
-        '<(skia_src_path)/core/SkImageCacherator.cpp',
-        '<(skia_src_path)/core/SkImageGenerator.cpp',
-        '<(skia_src_path)/core/SkLightingShader.h',
-        '<(skia_src_path)/core/SkLightingShader.cpp',
-        '<(skia_src_path)/core/SkLights.cpp',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline.cpp',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline.h',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline_core.h',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline_matrix.h',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline_tile.h',
-        '<(skia_src_path)/core/SkLinearBitmapPipeline_sample.h',
-        '<(skia_src_path)/core/SkLineClipper.cpp',
-        '<(skia_src_path)/core/SkLiteDL.cpp',
-        '<(skia_src_path)/core/SkLiteRecorder.cpp',
-        '<(skia_src_path)/core/SkLocalMatrixImageFilter.cpp',
-        '<(skia_src_path)/core/SkLocalMatrixImageFilter.h',
-        '<(skia_src_path)/core/SkLocalMatrixShader.cpp',
-        '<(skia_src_path)/core/SkMD5.cpp',
-        '<(skia_src_path)/core/SkMD5.h',
-        '<(skia_src_path)/core/SkMallocPixelRef.cpp',
-        '<(skia_src_path)/core/SkMask.cpp',
-        '<(skia_src_path)/core/SkMaskCache.cpp',
-        '<(skia_src_path)/core/SkMaskFilter.cpp',
-        '<(skia_src_path)/core/SkMaskGamma.cpp',
-        '<(skia_src_path)/core/SkMaskGamma.h',
-        '<(skia_src_path)/core/SkMath.cpp',
-        '<(skia_src_path)/core/SkMathPriv.h',
-        '<(skia_src_path)/core/SkMatrix.cpp',
-        '<(skia_src_path)/core/SkMatrix44.cpp',
-        '<(skia_src_path)/core/SkMatrixImageFilter.cpp',
-        '<(skia_src_path)/core/SkMatrixImageFilter.h',
-        '<(skia_src_path)/core/SkMatrixUtils.h',
-        '<(skia_src_path)/core/SkMessageBus.h',
-        '<(skia_src_path)/core/SkMetaData.cpp',
-        '<(skia_src_path)/core/SkMipMap.cpp',
-        '<(skia_src_path)/core/SkMipMap.h',
-        '<(skia_src_path)/core/SkMiniRecorder.cpp',
-        '<(skia_src_path)/core/SkModeColorFilter.cpp',
-        '<(skia_src_path)/core/SkMultiPictureDraw.cpp',
-        '<(skia_src_path)/core/SkNextID.h',
-        '<(skia_src_path)/core/SkLatticeIter.cpp',
-        '<(skia_src_path)/core/SkLatticeIter.h',
-        '<(skia_src_path)/core/SkNormalBevelSource.cpp',
-        '<(skia_src_path)/core/SkNormalBevelSource.h',
-        '<(skia_src_path)/core/SkNormalMapSource.cpp',
-        '<(skia_src_path)/core/SkNormalMapSource.h',
-        '<(skia_src_path)/core/SkNormalFlatSource.cpp',
-        '<(skia_src_path)/core/SkNormalFlatSource.h',
-        '<(skia_src_path)/core/SkNormalSource.cpp',
-        '<(skia_src_path)/core/SkNormalSource.h',
-        '<(skia_src_path)/core/SkNormalSourcePriv.h',
-        '<(skia_src_path)/core/SkNx.h',
-        '<(skia_src_path)/core/SkOpts.cpp',
-        '<(skia_src_path)/core/SkOpts.h',
-        '<(skia_src_path)/core/SkOrderedReadBuffer.h',
-        '<(skia_src_path)/core/SkPaint.cpp',
-        '<(skia_src_path)/core/SkPaintDefaults.h',
-        '<(skia_src_path)/core/SkPaintPriv.cpp',
-        '<(skia_src_path)/core/SkPaintPriv.h',
-        '<(skia_src_path)/core/SkPath.cpp',
-        '<(skia_src_path)/core/SkPathEffect.cpp',
-        '<(skia_src_path)/core/SkPathMeasure.cpp',
-        '<(skia_src_path)/core/SkPathPriv.h',
-        '<(skia_src_path)/core/SkPathRef.cpp',
-        '<(skia_src_path)/core/SkPerspIter.h',
-        '<(skia_src_path)/core/SkPicture.cpp',
-        '<(skia_src_path)/core/SkPictureAnalyzer.cpp',
-        '<(skia_src_path)/core/SkPictureCommon.h',
-        '<(skia_src_path)/core/SkPictureContentInfo.cpp',
-        '<(skia_src_path)/core/SkPictureContentInfo.h',
-        '<(skia_src_path)/core/SkPictureData.cpp',
-        '<(skia_src_path)/core/SkPictureData.h',
-        '<(skia_src_path)/core/SkPictureFlat.cpp',
-        '<(skia_src_path)/core/SkPictureFlat.h',
-        '<(skia_src_path)/core/SkPictureImageGenerator.cpp',
-        '<(skia_src_path)/core/SkPicturePlayback.cpp',
-        '<(skia_src_path)/core/SkPicturePlayback.h',
-        '<(skia_src_path)/core/SkPictureRecord.cpp',
-        '<(skia_src_path)/core/SkPictureRecord.h',
-        '<(skia_src_path)/core/SkPictureRecorder.cpp',
-        '<(skia_src_path)/core/SkPictureShader.cpp',
-        '<(skia_src_path)/core/SkPictureShader.h',
-        '<(skia_src_path)/core/SkPixelRef.cpp',
-        '<(skia_src_path)/core/SkPixmap.cpp',
-        '<(skia_src_path)/core/SkPoint.cpp',
-        '<(skia_src_path)/core/SkPoint3.cpp',
-        '<(skia_src_path)/core/SkPtrRecorder.cpp',
-        '<(skia_src_path)/core/SkQuadClipper.cpp',
-        '<(skia_src_path)/core/SkQuadClipper.h',
-        '<(skia_src_path)/core/SkRadialShadowMapShader.cpp',
-        '<(skia_src_path)/core/SkRadialShadowMapShader.h',
-        '<(skia_src_path)/core/SkRasterClip.cpp',
-        '<(skia_src_path)/core/SkRasterPipeline.cpp',
-        '<(skia_src_path)/core/SkRasterPipelineBlitter.cpp',
-        '<(skia_src_path)/core/SkRasterizer.cpp',
-        '<(skia_src_path)/core/SkReadBuffer.h',
-        '<(skia_src_path)/core/SkReadBuffer.cpp',
-        '<(skia_src_path)/core/SkReader32.h',
-        '<(skia_src_path)/core/SkRecord.cpp',
-        '<(skia_src_path)/core/SkRecords.cpp',
-        '<(skia_src_path)/core/SkRecordDraw.cpp',
-        '<(skia_src_path)/core/SkRecordOpts.cpp',
-        '<(skia_src_path)/core/SkRecordOpts.h',
-        '<(skia_src_path)/core/SkRecordPattern.h',
-        '<(skia_src_path)/core/SkRecordedDrawable.cpp',
-        '<(skia_src_path)/core/SkRecorder.cpp',
-        '<(skia_src_path)/core/SkRect.cpp',
-        '<(skia_src_path)/core/SkRefDict.cpp',
-        '<(skia_src_path)/core/SkRegion.cpp',
-        '<(skia_src_path)/core/SkRegionPriv.h',
-        '<(skia_src_path)/core/SkRegion_path.cpp',
-        '<(skia_src_path)/core/SkResourceCache.cpp',
-        '<(skia_src_path)/core/SkRRect.cpp',
-        '<(skia_src_path)/core/SkRTree.h',
-        '<(skia_src_path)/core/SkRTree.cpp',
-        '<(skia_src_path)/core/SkRWBuffer.cpp',
-        '<(skia_src_path)/core/SkScalar.cpp',
-        '<(skia_src_path)/core/SkScalerContext.cpp',
-        '<(skia_src_path)/core/SkScalerContext.h',
-        '<(skia_src_path)/core/SkScan.cpp',
-        '<(skia_src_path)/core/SkScan.h',
-        '<(skia_src_path)/core/SkScanPriv.h',
-        '<(skia_src_path)/core/SkScan_AAAPath.cpp',
-        '<(skia_src_path)/core/SkScan_AntiPath.cpp',
-        '<(skia_src_path)/core/SkScan_Antihair.cpp',
-        '<(skia_src_path)/core/SkScan_Hairline.cpp',
-        '<(skia_src_path)/core/SkScan_Path.cpp',
-        '<(skia_src_path)/core/SkSemaphore.cpp',
-        '<(skia_src_path)/core/SkShader.cpp',
-        '<(skia_src_path)/core/SkSharedMutex.cpp',
-        '<(skia_src_path)/core/SkSharedMutex.h',
-        '<(skia_src_path)/core/SkSinglyLinkedList.h',
-        '<(skia_src_path)/core/SkSmallAllocator.h',
-        '<(skia_src_path)/core/SkSpanProcs.cpp',
-        '<(skia_src_path)/core/SkSpecialImage.cpp',
-        '<(skia_src_path)/core/SkSpecialImage.h',
-        '<(skia_src_path)/core/SkSpecialSurface.cpp',
-        '<(skia_src_path)/core/SkSpecialSurface.h',
-        '<(skia_src_path)/core/SkSpinlock.cpp',
-        '<(skia_src_path)/core/SkSpriteBlitter_ARGB32.cpp',
-        '<(skia_src_path)/core/SkSpriteBlitter_RGB16.cpp',
-        '<(skia_src_path)/core/SkSpriteBlitter.h',
-        '<(skia_src_path)/core/SkSpriteBlitterTemplate.h',
-        '<(skia_src_path)/core/SkSpriteBlitter4f.cpp',
-        '<(skia_src_path)/core/SkStream.cpp',
-        '<(skia_src_path)/core/SkStreamPriv.h',
-        '<(skia_src_path)/core/SkString.cpp',
-        '<(skia_src_path)/core/SkStringUtils.cpp',
-        '<(skia_src_path)/core/SkStroke.h',
-        '<(skia_src_path)/core/SkStroke.cpp',
-        '<(skia_src_path)/core/SkStrokeRec.cpp',
-        '<(skia_src_path)/core/SkStrokerPriv.cpp',
-        '<(skia_src_path)/core/SkStrokerPriv.h',
-        '<(skia_src_path)/core/SkSurfacePriv.h',
-        '<(skia_src_path)/core/SkSwizzle.cpp',
-        '<(skia_src_path)/core/SkSRGB.cpp',
-        '<(skia_src_path)/core/SkTaskGroup.cpp',
-        '<(skia_src_path)/core/SkTaskGroup.h',
-        '<(skia_src_path)/core/SkTDPQueue.h',
-        '<(skia_src_path)/core/SkTDynamicHash.h',
-        '<(skia_src_path)/core/SkTInternalLList.h',
-        '<(skia_src_path)/core/SkTextBlob.cpp',
-        '<(skia_src_path)/core/SkTextFormatParams.h',
-        '<(skia_src_path)/core/SkTextMapStateProc.h',
-        '<(skia_src_path)/core/SkTextToPathIter.h',
-        '<(skia_src_path)/core/SkTime.cpp',
-        '<(skia_src_path)/core/SkTDPQueue.h',
-        '<(skia_src_path)/core/SkThreadID.cpp',
-        '<(skia_src_path)/core/SkTLList.h',
-        '<(skia_src_path)/core/SkTLS.cpp',
-        '<(skia_src_path)/core/SkTMultiMap.h',
-        '<(skia_src_path)/core/SkTraceEvent.h',
-        '<(skia_src_path)/core/SkTraceEventCommon.h',
-        '<(skia_src_path)/core/SkTSearch.cpp',
-        '<(skia_src_path)/core/SkTSort.h',
-        '<(skia_src_path)/core/SkTTopoSort.h',
-        '<(skia_src_path)/core/SkTypeface.cpp',
-        '<(skia_src_path)/core/SkTypefaceCache.cpp',
-        '<(skia_src_path)/core/SkTypefaceCache.h',
-        '<(skia_src_path)/core/SkTypefacePriv.h',
-        '<(skia_src_path)/core/SkUnPreMultiply.cpp',
-        '<(skia_src_path)/core/SkUtils.cpp',
-        '<(skia_src_path)/core/SkUtils.h',
-        '<(skia_src_path)/core/SkValidatingReadBuffer.cpp',
-        '<(skia_src_path)/core/SkValidatingReadBuffer.h',
-        '<(skia_src_path)/core/SkValidationUtils.h',
-        '<(skia_src_path)/core/SkVarAlloc.cpp',
-        '<(skia_src_path)/core/SkVertState.cpp',
-        '<(skia_src_path)/core/SkWriteBuffer.cpp',
-        '<(skia_src_path)/core/SkWriter32.cpp',
-        '<(skia_src_path)/core/SkXfermode.cpp',
-        '<(skia_src_path)/core/SkXfermode4f.cpp',
-        '<(skia_src_path)/core/SkXfermodeF16.cpp',
-        '<(skia_src_path)/core/SkXfermode_proccoeff.h',
-        '<(skia_src_path)/core/SkXfermodeInterpretation.cpp',
-        '<(skia_src_path)/core/SkXfermodeInterpretation.h',
-        '<(skia_src_path)/core/SkYUVPlanesCache.cpp',
-        '<(skia_src_path)/core/SkYUVPlanesCache.h',
-        '<(skia_src_path)/core/SkShadowShader.cpp',
-        '<(skia_src_path)/core/SkShadowShader.h',
-
-        '<(skia_src_path)/image/SkImage.cpp',
-        '<(skia_src_path)/image/SkImage_Generator.cpp',
-#        '<(skia_src_path)/image/SkImage_Gpu.cpp',
-        '<(skia_src_path)/image/SkImage_Raster.cpp',
-        '<(skia_src_path)/image/SkImageShader.cpp',
-        '<(skia_src_path)/image/SkImageShader.h',
-        '<(skia_src_path)/image/SkSurface.cpp',
-        '<(skia_src_path)/image/SkSurface_Base.h',
-#        '<(skia_src_path)/image/SkSurface_Gpu.cpp',
-        '<(skia_src_path)/image/SkSurface_Raster.cpp',
-
-        '<(skia_src_path)/pipe/SkPipeCanvas.cpp',
-        '<(skia_src_path)/pipe/SkPipeReader.cpp',
-
-        '<(skia_include_path)/core/SkBBHFactory.h',
-        '<(skia_include_path)/core/SkBitmap.h',
-        '<(skia_include_path)/core/SkBitmapDevice.h',
-        '<(skia_include_path)/core/SkBlitRow.h',
-        '<(skia_include_path)/core/SkCanvas.h',
-        '<(skia_include_path)/core/SkChunkAlloc.h',
-        '<(skia_include_path)/core/SkClipStack.h',
-        '<(skia_include_path)/core/SkColor.h',
-        '<(skia_include_path)/core/SkColorFilter.h',
-        '<(skia_include_path)/core/SkColorPriv.h',
-        '<(skia_include_path)/core/SkData.h',
-        '<(skia_include_path)/core/SkDeque.h',
-        '<(skia_include_path)/core/SkDevice.h',
-        '<(skia_include_path)/core/SkDraw.h',
-        '<(skia_include_path)/core/SkDrawable.h',
-        '<(skia_include_path)/core/SkDrawFilter.h',
-        '<(skia_include_path)/core/SkDrawLooper.h',
-        '<(skia_include_path)/core/SkFlattenable.h',
-        '<(skia_include_path)/core/SkFlattenableSerialization.h',
-        '<(skia_include_path)/core/SkFontLCDConfig.h',
-        '<(skia_include_path)/core/SkFontStyle.h',
-        '<(skia_include_path)/core/SkGraphics.h',
-        '<(skia_include_path)/core/SkImage.h',
-        '<(skia_include_path)/core/SkImageEncoder.h',
-        '<(skia_include_path)/core/SkImageFilter.h',
-        '<(skia_include_path)/core/SkImageInfo.h',
-        '<(skia_include_path)/core/SkLights.h',
-        '<(skia_include_path)/core/SkMallocPixelRef.h',
-        '<(skia_include_path)/core/SkMask.h',
-        '<(skia_include_path)/core/SkMaskFilter.h',
-        '<(skia_include_path)/core/SkMath.h',
-        '<(skia_include_path)/core/SkMatrix.h',
-        '<(skia_include_path)/core/SkMatrix44.h',
-        '<(skia_include_path)/core/SkMetaData.h',
-        '<(skia_include_path)/core/SkMultiPictureDraw.h',
-        '<(skia_include_path)/core/SkOSFile.h',
-        '<(skia_include_path)/core/SkPaint.h',
-        '<(skia_include_path)/core/SkPath.h',
-        '<(skia_include_path)/core/SkPathEffect.h',
-        '<(skia_include_path)/core/SkPathMeasure.h',
-        '<(skia_include_path)/core/SkPathRef.h',
-        '<(skia_include_path)/core/SkPicture.h',
-        '<(skia_include_path)/core/SkPictureAnalyzer.h',
-        '<(skia_include_path)/core/SkPictureRecorder.h',
-        '<(skia_include_path)/core/SkPixelRef.h',
-        '<(skia_include_path)/core/SkPoint.h',
-        '<(skia_include_path)/core/SkPoint3.h',
-        '<(skia_include_path)/core/SkPreConfig.h',
-        '<(skia_include_path)/core/SkRasterizer.h',
-        '<(skia_include_path)/core/SkRect.h',
-        '<(skia_include_path)/core/SkRefCnt.h',
-        '<(skia_include_path)/core/SkRegion.h',
-        '<(skia_include_path)/core/SkRRect.h',
-        '<(skia_include_path)/core/SkScalar.h',
-        '<(skia_include_path)/core/SkShader.h',
-        '<(skia_include_path)/core/SkStream.h',
-        '<(skia_include_path)/core/SkString.h',
-        '<(skia_include_path)/core/SkStrokeRec.h',
-        '<(skia_include_path)/core/SkSurface.h',
-        '<(skia_include_path)/core/SkSwizzle.h',
-        '<(skia_include_path)/core/SkTRegistry.h',
-        '<(skia_include_path)/core/SkTextBlob.h',
-        '<(skia_include_path)/core/SkTime.h',
-        '<(skia_include_path)/core/SkTLazy.h',
-        '<(skia_include_path)/core/SkTypeface.h',
-        '<(skia_include_path)/core/SkTypes.h',
-        '<(skia_include_path)/core/SkUnPreMultiply.h',
-        '<(skia_include_path)/core/SkWriter32.h',
-        '<(skia_include_path)/core/SkXfermode.h',
-
-        # private
-        '<(skia_include_path)/private/SkAtomics.h',
-        '<(skia_include_path)/private/SkChecksum.h',
-        '<(skia_include_path)/private/SkFixed.h',
-        '<(skia_include_path)/private/SkFloatBits.h',
-        '<(skia_include_path)/private/SkFloatingPoint.h',
-        '<(skia_include_path)/private/SkMiniRecorder.h',
-        '<(skia_include_path)/private/SkMutex.h',
-        '<(skia_include_path)/private/SkOnce.h',
-        '<(skia_include_path)/private/SkRecords.h',
-        '<(skia_include_path)/private/SkSemaphore.h',
-        '<(skia_include_path)/private/SkShadowParams.h',
-        '<(skia_include_path)/private/SkSpinlock.h',
-        '<(skia_include_path)/private/SkTemplates.h',
-        '<(skia_include_path)/private/SkTArray.h',
-        '<(skia_include_path)/private/SkTDArray.h',
-        '<(skia_include_path)/private/SkTFitsIn.h',
-        '<(skia_include_path)/private/SkTHash.h',
-        '<(skia_include_path)/private/SkThreadID.h',
-        '<(skia_include_path)/private/SkTDict.h',
-        '<(skia_include_path)/private/SkTSearch.h',
-        '<(skia_include_path)/private/SkTLogic.h',
-        '<(skia_include_path)/private/SkWeakRefCnt.h',
-
-        # Path ops
-        '<(skia_include_path)/pathops/SkPathOps.h',
-
-        '<(skia_src_path)/pathops/SkAddIntersections.cpp',
-        '<(skia_src_path)/pathops/SkDConicLineIntersection.cpp',
-        '<(skia_src_path)/pathops/SkDCubicLineIntersection.cpp',
-        '<(skia_src_path)/pathops/SkDCubicToQuads.cpp',
-        '<(skia_src_path)/pathops/SkDLineIntersection.cpp',
-        '<(skia_src_path)/pathops/SkDQuadLineIntersection.cpp',
-        '<(skia_src_path)/pathops/SkIntersections.cpp',
-        '<(skia_src_path)/pathops/SkOpAngle.cpp',
-        '<(skia_src_path)/pathops/SkOpBuilder.cpp',
-        '<(skia_src_path)/pathops/SkOpCoincidence.cpp',
-        '<(skia_src_path)/pathops/SkOpContour.cpp',
-        '<(skia_src_path)/pathops/SkOpCubicHull.cpp',
-        '<(skia_src_path)/pathops/SkOpEdgeBuilder.cpp',
-        '<(skia_src_path)/pathops/SkOpSegment.cpp',
-        '<(skia_src_path)/pathops/SkOpSpan.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsCommon.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsConic.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsCubic.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsCurve.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsDebug.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsLine.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsOp.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsPoint.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsQuad.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsRect.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsSimplify.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsTSect.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsTightBounds.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsTypes.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsWinding.cpp',
-        '<(skia_src_path)/pathops/SkPathWriter.cpp',
-        '<(skia_src_path)/pathops/SkReduceOrder.cpp',
-
-        '<(skia_src_path)/pathops/SkAddIntersections.h',
-        '<(skia_src_path)/pathops/SkIntersectionHelper.h',
-        '<(skia_src_path)/pathops/SkIntersections.h',
-        '<(skia_src_path)/pathops/SkLineParameters.h',
-        '<(skia_src_path)/pathops/SkOpAngle.h',
-        '<(skia_src_path)/pathops/SkOpCoincidence.h',
-        '<(skia_src_path)/pathops/SkOpContour.h',
-        '<(skia_src_path)/pathops/SkOpEdgeBuilder.h',
-        '<(skia_src_path)/pathops/SkOpSegment.h',
-        '<(skia_src_path)/pathops/SkOpSpan.h',
-        '<(skia_src_path)/pathops/SkOpTAllocator.h',
-        '<(skia_src_path)/pathops/SkPathOpsBounds.h',
-        '<(skia_src_path)/pathops/SkPathOpsCommon.h',
-        '<(skia_src_path)/pathops/SkPathOpsConic.h',
-        '<(skia_src_path)/pathops/SkPathOpsCubic.h',
-        '<(skia_src_path)/pathops/SkPathOpsCurve.h',
-        '<(skia_src_path)/pathops/SkPathOpsDebug.h',
-        '<(skia_src_path)/pathops/SkPathOpsLine.h',
-        '<(skia_src_path)/pathops/SkPathOpsPoint.h',
-        '<(skia_src_path)/pathops/SkPathOpsQuad.h',
-        '<(skia_src_path)/pathops/SkPathOpsRect.h',
-        '<(skia_src_path)/pathops/SkPathOpsTSect.h',
-        '<(skia_src_path)/pathops/SkPathOpsTypes.h',
-        '<(skia_src_path)/pathops/SkPathWriter.h',
-        '<(skia_src_path)/pathops/SkReduceOrder.h',
-    ],
-}
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index 4dea202d3d..9b90d758f5 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -15,9 +15,6 @@
         'images.gyp:*',
         'utils.gyp:utils',
       ],
-      'includes': [
-        'effects.gypi',
-      ],
       'include_dirs': [
         '../include/effects',
         '../include/client/android',
@@ -34,7 +31,7 @@
         ],
       },
       'sources': [
-        'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
+        '<!@(python read_gni.py ../gn/effects.gni skia_effects_sources)'
       ],
       'conditions': [
         ['skia_gpu == 1', {
diff --git a/gyp/effects.gypi b/gyp/effects.gypi
deleted file mode 100644
index decae7a688..0000000000
--- a/gyp/effects.gypi
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Include this gypi to include all 'effects' files
-# The parent gyp/gypi file must define:
-#       'skia_src_path'     e.g. skia/trunk/src
-#       'skia_include_path' e.g. skia/trunk/include
-#
-# The skia build defines these in common_variables.gypi.
-#
-{
-  'sources': [
-    '<(skia_src_path)/effects/GrCircleBlurFragmentProcessor.cpp',
-    '<(skia_src_path)/effects/GrCircleBlurFragmentProcessor.h',
-    '<(skia_src_path)/effects/GrAlphaThresholdFragmentProcessor.cpp',
-    '<(skia_src_path)/effects/GrAlphaThresholdFragmentProcessor.h',
-
-    '<(skia_src_path)/effects/Sk1DPathEffect.cpp',
-    '<(skia_src_path)/effects/Sk2DPathEffect.cpp',
-    '<(skia_src_path)/effects/SkAlphaThresholdFilter.cpp',
-    '<(skia_src_path)/effects/SkArcToPathEffect.cpp',
-    '<(skia_src_path)/effects/SkArithmeticMode.cpp',
-    '<(skia_src_path)/effects/SkArithmeticMode_gpu.cpp',
-    '<(skia_src_path)/effects/SkArithmeticMode_gpu.h',
-    '<(skia_src_path)/effects/SkBlurDrawLooper.cpp',
-    '<(skia_src_path)/effects/SkBlurMask.cpp',
-    '<(skia_src_path)/effects/SkBlurMask.h',
-    '<(skia_src_path)/effects/SkBlurMaskFilter.cpp',
-    '<(skia_src_path)/effects/SkColorCubeFilter.cpp',
-    '<(skia_src_path)/effects/SkColorFilterImageFilter.cpp',
-    '<(skia_src_path)/effects/SkColorMatrix.cpp',
-    '<(skia_src_path)/effects/SkColorMatrixFilter.cpp',
-    '<(skia_src_path)/effects/SkComposeImageFilter.cpp',
-    '<(skia_src_path)/effects/SkCornerPathEffect.cpp',
-    '<(skia_src_path)/effects/SkDashPathEffect.cpp',
-    '<(skia_src_path)/effects/SkDiscretePathEffect.cpp',
-    '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp',
-    '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp',
-    '<(skia_src_path)/effects/SkEmbossMask.cpp',
-    '<(skia_src_path)/effects/SkEmbossMask.h',
-    '<(skia_src_path)/effects/SkEmbossMask_Table.h',
-    '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp',
-    '<(skia_src_path)/effects/SkImageSource.cpp',
-    '<(skia_src_path)/effects/SkGammaColorFilter.cpp',
-    '<(skia_src_path)/effects/SkGaussianEdgeShader.cpp',
-    '<(skia_src_path)/effects/SkLayerDrawLooper.cpp',
-    '<(skia_src_path)/effects/SkLayerRasterizer.cpp',
-    '<(skia_src_path)/effects/SkLightingImageFilter.cpp',
-    '<(skia_src_path)/effects/SkLumaColorFilter.cpp',
-    '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp',
-    '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp',
-    '<(skia_src_path)/effects/SkMergeImageFilter.cpp',
-    '<(skia_src_path)/effects/SkMorphologyImageFilter.cpp',
-    '<(skia_src_path)/effects/SkOffsetImageFilter.cpp',
-    '<(skia_src_path)/effects/SkPackBits.cpp',
-    '<(skia_src_path)/effects/SkPackBits.h',
-    '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp',
-    '<(skia_src_path)/effects/SkPaintImageFilter.cpp',
-    '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp',
-    '<(skia_src_path)/effects/SkPictureImageFilter.cpp',
-    '<(skia_src_path)/effects/SkRRectsGaussianEdgeMaskFilter.cpp',
-    '<(skia_src_path)/effects/SkTableColorFilter.cpp',
-    '<(skia_src_path)/effects/SkTableMaskFilter.cpp',
-    '<(skia_src_path)/effects/SkTileImageFilter.cpp',
-    '<(skia_src_path)/effects/SkXfermodeImageFilter.cpp',
-
-    '<(skia_src_path)/effects/gradients/Sk4fGradientBase.cpp',
-    '<(skia_src_path)/effects/gradients/Sk4fGradientBase.h',
-    '<(skia_src_path)/effects/gradients/Sk4fGradientPriv.h',
-    '<(skia_src_path)/effects/gradients/Sk4fLinearGradient.cpp',
-    '<(skia_src_path)/effects/gradients/Sk4fLinearGradient.h',
-    '<(skia_src_path)/effects/gradients/SkClampRange.cpp',
-    '<(skia_src_path)/effects/gradients/SkClampRange.h',
-    '<(skia_src_path)/effects/gradients/SkGradientBitmapCache.cpp',
-    '<(skia_src_path)/effects/gradients/SkGradientBitmapCache.h',
-    '<(skia_src_path)/effects/gradients/SkGradientShader.cpp',
-    '<(skia_src_path)/effects/gradients/SkGradientShaderPriv.h',
-    '<(skia_src_path)/effects/gradients/SkLinearGradient.cpp',
-    '<(skia_src_path)/effects/gradients/SkLinearGradient.h',
-    '<(skia_src_path)/effects/gradients/SkRadialGradient.cpp',
-    '<(skia_src_path)/effects/gradients/SkRadialGradient.h',
-    '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient.cpp',
-    '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient.h',
-    '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
-    '<(skia_src_path)/effects/gradients/SkTwoPointConicalGradient_gpu.h',
-    '<(skia_src_path)/effects/gradients/SkSweepGradient.cpp',
-    '<(skia_src_path)/effects/gradients/SkSweepGradient.h',
-
-    '<(skia_include_path)/effects/Sk1DPathEffect.h',
-    '<(skia_include_path)/effects/Sk2DPathEffect.h',
-    '<(skia_include_path)/effects/SkAlphaThresholdFilter.h',
-    '<(skia_include_path)/effects/SkArithmeticMode.h',
-    '<(skia_include_path)/effects/SkBlurDrawLooper.h',
-    '<(skia_include_path)/effects/SkBlurImageFilter.h',
-    '<(skia_include_path)/effects/SkBlurMaskFilter.h',
-    '<(skia_include_path)/effects/SkColorCubeFilter.h',
-    '<(skia_include_path)/effects/SkColorFilterImageFilter.h',
-    '<(skia_include_path)/effects/SkColorMatrix.h',
-    '<(skia_include_path)/effects/SkColorMatrixFilter.h',
-    '<(skia_include_path)/effects/SkCornerPathEffect.h',
-    '<(skia_include_path)/effects/SkDashPathEffect.h',
-    '<(skia_include_path)/effects/SkDiscretePathEffect.h',
-    '<(skia_include_path)/effects/SkDisplacementMapEffect.h',
-    '<(skia_include_path)/effects/SkDropShadowImageFilter.h',
-    '<(skia_include_path)/effects/SkEmbossMaskFilter.h',
-    '<(skia_include_path)/effects/SkGammaColorFilter.h',
-    '<(skia_include_path)/effects/SkGaussianEdgeShader.h',
-    '<(skia_include_path)/effects/SkGradientShader.h',
-    '<(skia_include_path)/effects/SkImageSource.h',
-    '<(skia_include_path)/effects/SkLayerDrawLooper.h',
-    '<(skia_include_path)/effects/SkLayerRasterizer.h',
-    '<(skia_include_path)/effects/SkLightingImageFilter.h',
-    '<(skia_include_path)/effects/SkLumaColorFilter.h',
-    '<(skia_include_path)/effects/SkMagnifierImageFilter.h',
-    '<(skia_include_path)/effects/SkMorphologyImageFilter.h',
-    '<(skia_include_path)/effects/SkOffsetImageFilter.h',
-    '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h',
-    '<(skia_include_path)/effects/SkPaintImageFilter.h',
-    '<(skia_include_path)/effects/SkPerlinNoiseShader.h',
-    '<(skia_include_path)/effects/SkRRectsGaussianEdgeMaskFilter.h',
-    '<(skia_include_path)/effects/SkTableColorFilter.h',
-    '<(skia_include_path)/effects/SkTableMaskFilter.h',
-    '<(skia_include_path)/effects/SkTileImageFilter.h',
-    '<(skia_include_path)/effects/SkXfermodeImageFilter.h',
-  ],
-}
diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
deleted file mode 100644
index 9b59fb097a..0000000000
--- a/gyp/skia_for_android_framework_defines.gypi
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2014 Google Inc.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is included by chrome's skia/skia_common.gypi, and is intended to
-# augment the skia flags that are set there.
-
-{
-  'variables': {
-
-    # These flags will be defined in the android framework.
-    #
-    # If these become 'permanent', they should be moved into common_variables.gypi
-    #
-    'skia_for_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',
-    ],
-  },
-}