summaryrefslogtreecommitdiffstats
path: root/third_party/jsoncpp/jsoncpp.gyp
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 21:41:38 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 21:41:38 +0000
commit8b9af4497f93b42a0813e3841a75760149ef30a6 (patch)
tree7a59218a5c4fc26dc6d7989a8f02b3c5a16d1a95 /third_party/jsoncpp/jsoncpp.gyp
parent69eed56841712daa764d31a39017c8e8fb3d5d54 (diff)
downloadchromium_src-8b9af4497f93b42a0813e3841a75760149ef30a6.zip
chromium_src-8b9af4497f93b42a0813e3841a75760149ef30a6.tar.gz
chromium_src-8b9af4497f93b42a0813e3841a75760149ef30a6.tar.bz2
Create a local mod (based on jsoncpp trunk r248) to remove the static initialization caused by the global variable Value::null.
BUG=109997 TEST=unittests Review URL: http://codereview.chromium.org/9188042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/jsoncpp/jsoncpp.gyp')
-rw-r--r--third_party/jsoncpp/jsoncpp.gyp9
1 files changed, 6 insertions, 3 deletions
diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp
index bb323ef..1395f94 100644
--- a/third_party/jsoncpp/jsoncpp.gyp
+++ b/third_party/jsoncpp/jsoncpp.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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.
@@ -18,19 +18,22 @@
'source/include/json/forwards.h',
'source/include/json/json.h',
'source/include/json/reader.h',
- 'source/include/json/value.h',
+ 'overrides/include/json/value.h',
'source/include/json/writer.h',
'source/src/lib_json/json_batchallocator.h',
'source/src/lib_json/json_reader.cpp',
'source/src/lib_json/json_tool.h',
- 'source/src/lib_json/json_value.cpp',
+ 'overrides/src/lib_json/json_value.cpp',
'source/src/lib_json/json_writer.cpp',
],
'include_dirs': [
+ 'overrides/include/',
'source/include/',
+ 'source/src/lib_json/',
],
'direct_dependent_settings': {
'include_dirs': [
+ 'overrides/include/',
'source/include/',
],
},