Remove all references to jsoncpp (build scripts, DEPS, etc) Bug: skia: Change-Id: I3cec245e537eee3e6ceb0a4a52bad733c2c8746e Reviewed-on: https://skia-review.googlesource.com/c/189842 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
diff --git a/DEPS b/DEPS index 37f2798..9a5f33f 100644 --- a/DEPS +++ b/DEPS
@@ -15,8 +15,6 @@ "third_party/externals/harfbuzz" : "https://skia.googlesource.com/third_party/harfbuzz.git@8be74d85534534dbdd39a0a6f496e26e9f3e661d", "third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@407b39301e71006b68bd38e770f35d32398a7b14", "third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@d38d7c6628bebd02692cfdd6fa76b4d992a35b75", - # TODO: remove jsoncpp after migrating clients to SkJSON - "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git@2.0.0", "third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@v1.6.33", "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v1.0.2-rc1",
diff --git a/public.bzl b/public.bzl index 40801d8..76ea8bd 100644 --- a/public.bzl +++ b/public.bzl
@@ -450,7 +450,6 @@ "tools/ResourceFactory.h", "tools/Resources.cpp", "tools/Resources.h", - "tools/SkJSONCPP.h", "tools/UrlDataManager.cpp", "tools/UrlDataManager.h", "tools/debugger/*.cpp",
diff --git a/third_party/jsoncpp/BUILD.gn b/third_party/jsoncpp/BUILD.gn deleted file mode 100644 index ff8351f..0000000 --- a/third_party/jsoncpp/BUILD.gn +++ /dev/null
@@ -1,28 +0,0 @@ -# Copyright 2016 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -declare_args() { - skia_use_system_jsoncpp = is_official_build -} - -import("../third_party.gni") - -if (skia_use_system_jsoncpp) { - system("jsoncpp") { - libs = [ "jsoncpp" ] - } -} else { - third_party("jsoncpp") { - public_include_dirs = [ "../externals/jsoncpp/include" ] - - defines = [ "JSON_USE_EXCEPTION=0" ] - sources = [ - "../externals/jsoncpp/src/lib_json/json_reader.cpp", - "../externals/jsoncpp/src/lib_json/json_value.cpp", - "../externals/jsoncpp/src/lib_json/json_writer.cpp", - ] - testonly = true - } -}
diff --git a/tools/SkJSONCPP.h b/tools/SkJSONCPP.h deleted file mode 100644 index 32ae495..0000000 --- a/tools/SkJSONCPP.h +++ /dev/null
@@ -1,33 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * A common place to put the jsoncpp library includes, as opposed to littering - * the pragmas repeatedly through our code. - */ -#ifndef SkJSONCPP_DEFINED -#define SkJSONCPP_DEFINED - -#ifdef SK_BUILD_FOR_GOOGLE3 - #include "third_party/jsoncpp/reader.h" - #include "third_party/jsoncpp/value.h" - #include "third_party/jsoncpp/writer.h" -#else - #ifdef SK_BUILD_FOR_WIN - // json includes xlocale which generates warning 4530 because we're - // compiling without exceptions; - // see https://code.google.com/p/skia/issues/detail?id=1067 - #pragma warning(push) - #pragma warning(disable : 4530) - #endif - #include "json/reader.h" - #include "json/value.h" - #include "json/writer.h" - #ifdef SK_BUILD_FOR_WIN - #pragma warning(pop) - #endif -#endif - -#endif // SkJSONCPP_DEFINED
diff --git a/tools/check-headers-self-sufficient b/tools/check-headers-self-sufficient index 6212839..e60aa86 100755 --- a/tools/check-headers-self-sufficient +++ b/tools/check-headers-self-sufficient
@@ -79,7 +79,6 @@ '-Itools/gpu', '-Itools/timer', '-Ithird_party/etc1', - '-Ithird_party/externals/jsoncpp/include', '-Ithird_party/externals/libjpeg-turbo', '-Ithird_party/externals/sfntly/cpp/src', '-Ithird_party/externals/zlib',