Roll jsoncpp, drop dependency on Chromium overrides.
This rolls jsoncpp to head, crucially past "Added missing includes for
std::istream." which has given us some grief in the past. And it's required to
build jsoncpp against libc++.
Vanilla jsoncpp works just fine for us, so no need for Chromium's overrides.
Like all DEPS, only tools depend on jsoncpp.
BUG=skia:
R=bungeman@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/481823003
diff --git a/DEPS b/DEPS
index e2028e8..a3d7a3c 100644
--- a/DEPS
+++ b/DEPS
@@ -5,17 +5,12 @@
deps = {
"common": "https://skia.googlesource.com/common.git@a7b0283c39dfdf5553859eb9790c970bb52cda47",
- # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199
- # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279)
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@23a8a433529d9db23882c702a29d5e594841563d",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
"third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@3917682a16d5c19ff3576a8be0ffdb3a332954b1",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",
- "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b",
- # Move to a webp version newer than 0.3.0 to pickup NEON fix for iOS
- "third_party/externals/jsoncpp-chromium" : "https://chromium.googlesource.com/chromium/src/third_party/jsoncpp.git@41239939c0c60481f34887d52c038facf05f5533",
+ "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39",
- # "third_party/externals/v8" : "git://github.com/v8/v8.git@d15b0f0f2099dbd72867f3df70e9aaf5b8afbd2c",
"third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-beta",
}
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index 337f716..b6efd87 100644
--- a/gyp/jsoncpp.gyp
+++ b/gyp/jsoncpp.gyp
@@ -1,16 +1,6 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-
-# TODO: This file was copied from the external dependency
-# third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399,
-# with directory paths modified to work at this level.
-#
-# It would be better for us to depend on that gypfile within the external
-# dependency, but so far we have been unable to make that work reliably.
-# See https://code.google.com/p/skia/issues/detail?id=1023
-# and https://code.google.com/p/skia/source/detail?r=7115
-
{
'variables': {
'skia_warnings_as_errors': 0,
@@ -32,29 +22,16 @@
'JSON_USE_EXCEPTION=0',
],
'sources': [
- '../third_party/externals/jsoncpp/include/json/assertions.h',
- '../third_party/externals/jsoncpp/include/json/autolink.h',
- '../third_party/externals/jsoncpp/include/json/config.h',
- '../third_party/externals/jsoncpp/include/json/features.h',
- '../third_party/externals/jsoncpp/include/json/forwards.h',
- '../third_party/externals/jsoncpp/include/json/json.h',
- '../third_party/externals/jsoncpp/include/json/reader.h',
- '../third_party/externals/jsoncpp-chromium/overrides/include/json/value.h',
- '../third_party/externals/jsoncpp/include/json/writer.h',
- '../third_party/externals/jsoncpp/src/lib_json/json_batchallocator.h',
'../third_party/externals/jsoncpp/src/lib_json/json_reader.cpp',
- '../third_party/externals/jsoncpp/src/lib_json/json_tool.h',
- '../third_party/externals/jsoncpp-chromium/overrides/src/lib_json/json_value.cpp',
+ '../third_party/externals/jsoncpp/src/lib_json/json_value.cpp',
'../third_party/externals/jsoncpp/src/lib_json/json_writer.cpp',
],
'include_dirs': [
- '../third_party/externals/jsoncpp-chromium/overrides/include/',
'../third_party/externals/jsoncpp/include/',
'../third_party/externals/jsoncpp/src/lib_json/',
],
'direct_dependent_settings': {
'include_dirs': [
- '../third_party/externals/jsoncpp-chromium/overrides/include/',
'../third_party/externals/jsoncpp/include/',
],
},
