Roll jsoncpp, drop dependency on Chromium overrides.

gyp/jsoncpp.gyp

Index: gyp/jsoncpp.gyp
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index 337f716a180e521e1932d268748321b3b203725b..b6efd87bf8e805fa30ef0b759fd6a36c1b3ff659 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',

[bungeman-skia, 2014/08/19 14:11:10]

In general, I rather like having the header files listed so I can see them in
IDEs. On the other hand I must say that I have no plans to look at this project
(and we sure don't edit it), so it doesn't matter that much I suppose.

-            '../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/',
             ],
           },