diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-26 17:19:03 -0400 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2016-10-26 21:44:49 +0000 |
| commit | cfc4f44aebdd560c600991ad900a4f07c3958c8f (patch) | |
| tree | 354e0cc067b753f3b18823e27c2b3e84087f7d8c | |
| parent | e902f8dc7e111ede8b22cbd9bb74f326b0ce36fb (diff) | |
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>
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | gn/android_framework_defines.gni | 19 | ||||
| -rw-r--r-- | gn/core.gni | 527 | ||||
| -rw-r--r-- | gn/effects.gni | 123 | ||||
| -rw-r--r-- | gn/shared_sources.gni | 35 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 5 | ||||
| -rw-r--r-- | gyp/core.gyp | 6 | ||||
| -rw-r--r-- | gyp/core.gypi | 529 | ||||
| -rw-r--r-- | gyp/effects.gyp | 5 | ||||
| -rw-r--r-- | gyp/effects.gypi | 127 | ||||
| -rw-r--r-- | gyp/skia_for_android_framework_defines.gypi | 29 |
11 files changed, 676 insertions, 732 deletions
@@ -3,6 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("gn/android_framework_defines.gni") import("gn/shared_sources.gni") if (!defined(is_skia_standalone)) { @@ -66,7 +67,7 @@ config("skia_public") { defines += [ "SK_SAMPLES_FOR_X" ] } if (skia_enable_android_framework_defines) { - defines += skia_android_framework_defines + defines += android_framework_defines } if (!skia_enable_gpu) { defines += [ "SK_SUPPORT_GPU=0" ] 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 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', - ], - }, -} |