aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-06-19 11:27:20 -0400
committerGravatar Kevin Lubick <kjlubick@google.com>2018-06-19 18:23:30 +0000
commit80452bee11ebe6708ea459ea34e526a44c04bdb0 (patch)
tree2e74fe66a6554f81909188b423f7ce4055cdaea3 /BUILD.gn
parent96aa535b782f31df0f063213c2958acba32a808d (diff)
Fold SkJSON into Skia/utils
It's a tiny, core-ish component -- might as well treat as such to simplify dependencies. Change-Id: I6f31ce2d151f9a629d88bfc7f15d64891d5150c0 Reviewed-on: https://skia-review.googlesource.com/135780 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn6
1 files changed, 1 insertions, 5 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 529a74f6b0..26cd616631 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1392,7 +1392,6 @@ if (skia_enable_tools) {
]
public_deps = [
":gpu_tool_utils", # Test.h #includes headers from this target.
- "modules/skjson:tests",
]
}
@@ -1407,9 +1406,6 @@ if (skia_enable_tools) {
":skia",
":tool_utils",
]
- public_deps = [
- "modules/skjson:bench",
- ]
}
test_lib("experimental_svg_model") {
@@ -1736,6 +1732,7 @@ if (skia_enable_tools) {
"fuzz/oss_fuzz/FuzzAnimatedImage.cpp",
"fuzz/oss_fuzz/FuzzImage.cpp",
"fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp",
+ "fuzz/oss_fuzz/FuzzJSON.cpp",
"fuzz/oss_fuzz/FuzzPathDeserialize.cpp",
"fuzz/oss_fuzz/FuzzRegionDeserialize.cpp",
"fuzz/oss_fuzz/FuzzRegionSetPath.cpp",
@@ -1750,7 +1747,6 @@ if (skia_enable_tools) {
":flags",
":gpu_tool_utils",
":skia",
- "modules/skjson:fuzz",
"modules/skottie:fuzz",
"//third_party/jsoncpp",
"//third_party/libpng",