diff options
author | Florin Malita <fmalita@chromium.org> | 2018-05-25 12:43:51 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-25 17:11:52 +0000 |
commit | 3b526b05d652ad6c310d9c636187b20b51c7648c (patch) | |
tree | 6c6fa99f2e80db81e9c3f593fe5883aabdaa442b /BUILD.gn | |
parent | 59da548b0c4d4239e0ec1855d3f7f77a2bff4b93 (diff) |
"Modularize" SkSG
* relocate all SkSG-related files under modules/sksg/
* fix various tidbits to make non-sksg builds possible
* drop obsolete SampleSGInval.cpp
Change-Id: I54e6c5bb1a09f45030fa8d607b3eb3f7cba78957
Reviewed-on: https://skia-review.googlesource.com/130025
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r-- | BUILD.gn | 52 |
1 files changed, 7 insertions, 45 deletions
@@ -1376,11 +1376,11 @@ if (skia_enable_tools) { public_include_dirs = [ "gm" ] sources = gm_sources deps = [ - ":experimental_sksg", ":flags", ":gpu_tool_utils", ":skia", ":tool_utils", + "modules/sksg", ] } @@ -1392,12 +1392,12 @@ if (skia_enable_tools) { sources -= [ "//tests/FontMgrAndroidParserTest.cpp" ] } deps = [ - ":experimental_sksg", ":experimental_svg_model", ":flags", ":skia", ":third_party_skcms", ":tool_utils", + "modules/sksg:tests", "//third_party/libpng", "//third_party/zlib", ] @@ -1432,8 +1432,8 @@ if (skia_enable_tools) { "experimental/skottie/SkottieValue.cpp", ] deps = [ - ":experimental_sksg", ":skia", + "modules/sksg", "//third_party/rapidjson", ] } @@ -1475,44 +1475,6 @@ if (skia_enable_tools) { } } - test_lib("experimental_sksg") { - public_include_dirs = [ - "experimental/sksg", - "experimental/sksg/effects", - "experimental/sksg/geometry", - "experimental/sksg/paint", - ] - sources = [ - "experimental/sksg/SkSGDraw.cpp", - "experimental/sksg/SkSGEffectNode.cpp", - "experimental/sksg/SkSGGeometryNode.cpp", - "experimental/sksg/SkSGGroup.cpp", - "experimental/sksg/SkSGImage.cpp", - "experimental/sksg/SkSGInvalidationController.cpp", - "experimental/sksg/SkSGNode.cpp", - "experimental/sksg/SkSGPaintNode.cpp", - "experimental/sksg/SkSGRenderNode.cpp", - "experimental/sksg/SkSGScene.cpp", - "experimental/sksg/effects/SkSGClipEffect.cpp", - "experimental/sksg/effects/SkSGMaskEffect.cpp", - "experimental/sksg/effects/SkSGOpacityEffect.cpp", - "experimental/sksg/effects/SkSGTransform.cpp", - "experimental/sksg/geometry/SkSGGeometryTransform.cpp", - "experimental/sksg/geometry/SkSGMerge.cpp", - "experimental/sksg/geometry/SkSGPath.cpp", - "experimental/sksg/geometry/SkSGPlane.cpp", - "experimental/sksg/geometry/SkSGRect.cpp", - "experimental/sksg/geometry/SkSGRoundEffect.cpp", - "experimental/sksg/geometry/SkSGText.cpp", - "experimental/sksg/geometry/SkSGTrimEffect.cpp", - "experimental/sksg/paint/SkSGColor.cpp", - "experimental/sksg/paint/SkSGGradient.cpp", - ] - deps = [ - ":skia", - ] - } - if (target_cpu != "wasm") { test_lib("views") { public_include_dirs = [ "include/views" ] @@ -1591,7 +1553,6 @@ if (skia_enable_tools) { include_dirs = [ "experimental" ] sources = samples_sources deps = [ - ":experimental_sksg", ":experimental_svg_model", ":flags", ":gm", @@ -1599,6 +1560,7 @@ if (skia_enable_tools) { ":tool_utils", ":views", ":xml", + "modules/sksg:samples", ] if (skia_use_lua) { @@ -1620,7 +1582,6 @@ if (skia_enable_tools) { deps = [ ":common_flags", ":experimental_skottie", - ":experimental_sksg", ":experimental_svg_model", ":flags", ":gm", @@ -1629,6 +1590,7 @@ if (skia_enable_tools) { ":tests", ":third_party_skcms", ":tool_utils", + "modules/sksg", "//third_party/jsoncpp", "//third_party/libpng", ] @@ -1653,13 +1615,13 @@ if (skia_enable_tools) { deps = [ ":bench", ":common_flags", - ":experimental_sksg", ":experimental_svg_model", ":flags", ":gm", ":gpu_tool_utils", ":skia", ":tool_utils", + "modules/sksg", "//third_party/jsoncpp", ] } @@ -2069,7 +2031,6 @@ if (skia_enable_tools) { include_dirs = [] deps = [ - ":experimental_sksg", ":experimental_svg_model", ":flags", ":gm", @@ -2079,6 +2040,7 @@ if (skia_enable_tools) { ":skia", ":tool_utils", ":views", + "modules/sksg", "//third_party/imgui", "//third_party/jsoncpp", ] |