diff options
| author |  mtklein <mtklein@chromium.org> | 2014-08-19 07:21:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-19 07:21:00 -0700 |
| commit | 3ba54fa0adb0a9bb81c09ef18d6f8cebea311a6f (patch) | |
| tree | 21825338f1d35db5289fca85aa9fd3c7a1eb3fa9 /gyp | |
| parent | 6332f1dd20d73a6d8b9564af7c27d09394eb6596 (diff) | |
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
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/jsoncpp.gyp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp index 337f716a18..b6efd87bf8 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/', ], }, |