Split SkSL and utils apart again into .gni files.
Also extend GN format presubmit check to .gni files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976
Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192
Reviewed-on: https://skia-review.googlesource.com/3976
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 1f1184e..067c1ed 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -59,15 +59,9 @@
"scope",
[ "../gyp/opts.gypi" ])
-# PDF.
import("pdf.gni")
-
-_sources_gypi = exec_script("gypi_to_gn.py",
- [ rebase_path("../gyp/skia_sources.gypi") ],
- "scope",
- [ "../gyp/skia_sources.gypi" ])
-skia_sksl_sources = get_path_info(_sources_gypi.sksl_sources, "abspath")
-skia_utils_sources = get_path_info(_sources_gypi.utils_sources, "abspath")
+import("sksl.gni")
+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.
diff --git a/gn/sksl.gni b/gn/sksl.gni
new file mode 100644
index 0000000..b76baec
--- /dev/null
+++ b/gn/sksl.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.
+
+# Things are easiest for everyone if these source paths are absolute.
+_src = get_path_info("../src", "abspath")
+
+skia_sksl_sources = [
+ "$_src/sksl/SkSLCFGGenerator.cpp",
+ "$_src/sksl/SkSLCompiler.cpp",
+ "$_src/sksl/SkSLIRGenerator.cpp",
+ "$_src/sksl/SkSLParser.cpp",
+ "$_src/sksl/SkSLGLSLCodeGenerator.cpp",
+ "$_src/sksl/SkSLSPIRVCodeGenerator.cpp",
+ "$_src/sksl/SkSLUtil.cpp",
+ "$_src/sksl/ir/SkSLSymbolTable.cpp",
+ "$_src/sksl/ir/SkSLType.cpp",
+]
diff --git a/gn/utils.gni b/gn/utils.gni
new file mode 100644
index 0000000..745ea7f
--- /dev/null
+++ b/gn/utils.gni
@@ -0,0 +1,116 @@
+# 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_utils_sources = [
+ "$_include/utils/SkBoundaryPatch.h",
+ "$_include/utils/SkFrontBufferedStream.h",
+ "$_include/utils/SkCamera.h",
+ "$_include/utils/SkCanvasStateUtils.h",
+ "$_include/utils/SkDumpCanvas.h",
+ "$_include/utils/SkEventTracer.h",
+ "$_include/utils/SkInterpolator.h",
+ "$_include/utils/SkLayer.h",
+ "$_include/utils/SkMeshUtils.h",
+ "$_include/utils/SkNoSaveLayerCanvas.h",
+ "$_include/utils/SkNWayCanvas.h",
+ "$_include/utils/SkNullCanvas.h",
+ "$_include/utils/SkPaintFilterCanvas.h",
+ "$_include/utils/SkParse.h",
+ "$_include/utils/SkParsePath.h",
+ "$_include/utils/SkPictureUtils.h",
+ "$_include/utils/SkRandom.h",
+ "$_include/utils/SkTextBox.h",
+
+ "$_src/utils/SkBase64.cpp",
+ "$_src/utils/SkBase64.h",
+ "$_src/utils/SkBitmapSourceDeserializer.cpp",
+ "$_src/utils/SkBitmapSourceDeserializer.h",
+ "$_src/utils/SkBitSet.h",
+ "$_src/utils/SkBoundaryPatch.cpp",
+ "$_src/utils/SkFrontBufferedStream.cpp",
+ "$_src/utils/SkCamera.cpp",
+ "$_src/utils/SkCanvasStack.h",
+ "$_src/utils/SkCanvasStack.cpp",
+ "$_src/utils/SkCanvasStateUtils.cpp",
+ "$_src/utils/SkCurveMeasure.cpp",
+ "$_src/utils/SkCurveMeasure.h",
+ "$_src/utils/SkDashPath.cpp",
+ "$_src/utils/SkDashPathPriv.h",
+ "$_src/utils/SkDeferredCanvas.cpp",
+ "$_src/utils/SkDumpCanvas.cpp",
+ "$_src/utils/SkEventTracer.cpp",
+ "$_src/utils/SkFloatUtils.h",
+ "$_src/utils/SkInterpolator.cpp",
+ "$_src/utils/SkLayer.cpp",
+ "$_src/utils/SkMatrix22.cpp",
+ "$_src/utils/SkMatrix22.h",
+ "$_src/utils/SkMeshUtils.cpp",
+ "$_src/utils/SkMultiPictureDocument.cpp",
+ "$_src/utils/SkNWayCanvas.cpp",
+ "$_src/utils/SkNullCanvas.cpp",
+ "$_src/utils/SkOSFile.cpp",
+ "$_src/utils/SkPaintFilterCanvas.cpp",
+ "$_src/utils/SkParse.cpp",
+ "$_src/utils/SkParseColor.cpp",
+ "$_src/utils/SkParsePath.cpp",
+ "$_src/utils/SkPatchGrid.cpp",
+ "$_src/utils/SkPatchGrid.h",
+ "$_src/utils/SkPatchUtils.cpp",
+ "$_src/utils/SkPatchUtils.h",
+ "$_src/utils/SkRGBAToYUV.cpp",
+ "$_src/utils/SkRGBAToYUV.h",
+ "$_src/utils/SkShadowPaintFilterCanvas.cpp",
+ "$_src/utils/SkShadowPaintFilterCanvas.h",
+ "$_src/utils/SkTextBox.cpp",
+ "$_src/utils/SkTextureCompressor.cpp",
+ "$_src/utils/SkTextureCompressor.h",
+ "$_src/utils/SkTextureCompressor_Utils.h",
+ "$_src/utils/SkTextureCompressor_ASTC.cpp",
+ "$_src/utils/SkTextureCompressor_ASTC.h",
+ "$_src/utils/SkTextureCompressor_Blitter.h",
+ "$_src/utils/SkTextureCompressor_R11EAC.cpp",
+ "$_src/utils/SkTextureCompressor_R11EAC.h",
+ "$_src/utils/SkTextureCompressor_LATC.cpp",
+ "$_src/utils/SkTextureCompressor_LATC.h",
+ "$_src/utils/SkThreadUtils.h",
+ "$_src/utils/SkThreadUtils_pthread.cpp",
+ "$_src/utils/SkThreadUtils_pthread.h",
+ "$_src/utils/SkThreadUtils_win.cpp",
+ "$_src/utils/SkThreadUtils_win.h",
+ "$_src/utils/SkWhitelistTypefaces.cpp",
+
+ #mac
+ "$_include/utils/mac/SkCGUtils.h",
+ "$_src/utils/mac/SkCreateCGImageRef.cpp",
+
+ #windows
+ "$_src/utils/win/SkAutoCoInitialize.h",
+ "$_src/utils/win/SkAutoCoInitialize.cpp",
+ "$_src/utils/win/SkDWrite.h",
+ "$_src/utils/win/SkDWrite.cpp",
+ "$_src/utils/win/SkDWriteFontFileStream.cpp",
+ "$_src/utils/win/SkDWriteFontFileStream.h",
+ "$_src/utils/win/SkDWriteGeometrySink.cpp",
+ "$_src/utils/win/SkDWriteGeometrySink.h",
+ "$_src/utils/win/SkHRESULT.h",
+ "$_src/utils/win/SkHRESULT.cpp",
+ "$_src/utils/win/SkIStream.h",
+ "$_src/utils/win/SkIStream.cpp",
+ "$_src/utils/win/SkTScopedComPtr.h",
+ "$_src/utils/win/SkWGL.h",
+ "$_src/utils/win/SkWGL_win.cpp",
+
+ #testing
+ "$_src/fonts/SkGScalerContext.cpp",
+ "$_src/fonts/SkGScalerContext.h",
+ "$_src/fonts/SkRandomScalerContext.cpp",
+ "$_src/fonts/SkRandomScalerContext.h",
+ "$_src/fonts/SkTestScalerContext.cpp",
+ "$_src/fonts/SkTestScalerContext.h",
+]