From 80452bee11ebe6708ea459ea34e526a44c04bdb0 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Tue, 19 Jun 2018 11:27:20 -0400 Subject: 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 Reviewed-by: Kevin Lubick Commit-Queue: Florin Malita --- BUILD.gn | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'BUILD.gn') 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", -- cgit v1.2.3