Commit 592d0751 authored by Jordan Bayles's avatar Jordan Bayles Committed by Commit Bot

Roll JsonCpp

This patch rolls JsonCpp to HEAD.

Bug: 989851
Change-Id: I062f7d398190b61a66d48952b7504848ab1d75ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2433107Reviewed-by: default avatarTakumi Fujimoto <takumif@chromium.org>
Reviewed-by: default avatarJordan Bayles <jophba@chromium.org>
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810999}
parent 5a23bbed
...@@ -1079,7 +1079,7 @@ deps = { ...@@ -1079,7 +1079,7 @@ deps = {
'src/third_party/jsoncpp/source': 'src/third_party/jsoncpp/source':
Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git'
+ '@' + '645250b6690785be60ab6780ce4b58698d884d11', # release 1.9.1 + '@' + '9059f5cad030ba11d37818847443a53918c327b1', # release 1.9.4
'src/third_party/junit/src': { 'src/third_party/junit/src': {
'url': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481', 'url': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
......
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
config("jsoncpp_config") { config("jsoncpp_config") {
include_dirs = [ include_dirs = [ "source/include" ]
"source/include",
"generated",
]
# TODO(crbug.com/983223): Update JsonCpp BUILD.gn to remove deprecated # TODO(crbug.com/983223): Update JsonCpp BUILD.gn to remove deprecated
# declaration flag. # declaration flag.
...@@ -21,15 +18,15 @@ config("jsoncpp_config") { ...@@ -21,15 +18,15 @@ config("jsoncpp_config") {
source_set("jsoncpp") { source_set("jsoncpp") {
sources = [ sources = [
"generated/version.h", "source/include/json/allocator.h",
"source/include/json/assertions.h", "source/include/json/assertions.h",
"source/include/json/autolink.h",
"source/include/json/config.h", "source/include/json/config.h",
"source/include/json/features.h",
"source/include/json/forwards.h", "source/include/json/forwards.h",
"source/include/json/json.h", "source/include/json/json.h",
"source/include/json/json_features.h",
"source/include/json/reader.h", "source/include/json/reader.h",
"source/include/json/value.h", "source/include/json/value.h",
"source/include/json/version.h",
"source/include/json/writer.h", "source/include/json/writer.h",
"source/src/lib_json/json_reader.cpp", "source/src/lib_json/json_reader.cpp",
"source/src/lib_json/json_tool.h", "source/src/lib_json/json_tool.h",
......
Name: jsoncpp Name: jsoncpp
URL: https://github.com/open-source-parsers/jsoncpp URL: https://github.com/open-source-parsers/jsoncpp
Version: 645250b6690785be60ab6780ce4b58698d884d11 Version: 1.9.4
CPEPrefix: cpe:/a:jsoncpp_project:jsoncpp:1.9.1 CPEPrefix: cpe:/a:jsoncpp_project:jsoncpp:1.9.4
License: MIT License: MIT
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
...@@ -11,7 +11,3 @@ JsonCpp is used by multiple projects for parsing and generating JSON data. This ...@@ -11,7 +11,3 @@ JsonCpp is used by multiple projects for parsing and generating JSON data. This
project is mirrored here from the public GitHub project, with a custom BUILD.gn project is mirrored here from the public GitHub project, with a custom BUILD.gn
to allow for building with our Ninja + GN configuration. The main project uses to allow for building with our Ninja + GN configuration. The main project uses
Meson or CMake for building. Meson or CMake for building.
Note: to update this project to a new version, regenerating the version.h header
is required. This can be done by installing either CMake or Meson, building the
project, and copying the generated version.h to the generated/ subfolder.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment