diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 03:14:48 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 03:14:48 +0000 |
commit | 1e4c27943a89fe8042d098d7611e23e053ec547a (patch) | |
tree | e4e6b8248ffcf0239953cdbfd84a95d4fb8991ab /third_party | |
parent | a235ce359b362b0e0412b1830a811d9ff1a3b261 (diff) | |
download | chromium_src-1e4c27943a89fe8042d098d7611e23e053ec547a.zip chromium_src-1e4c27943a89fe8042d098d7611e23e053ec547a.tar.gz chromium_src-1e4c27943a89fe8042d098d7611e23e053ec547a.tar.bz2 |
Revert 106424. This caused
82>svn: PROPFIND of '/svnroot/jsoncpp/trunk/jsoncpp': Server certificate verification failed: issuer is not trusted (https://jsoncpp.svn.sourceforge.net)
on most mac bots, which causes full re-checkouts of all files on every build.
- Add jsoncpp in DEPS and the gyp file to build jsoncpp in chromium.
The jsoncpp is needed by libjingle as part of the webrtc effort. This patch probably not be the best solution as there's already one chrome json parser in base and another jsoncpp copy in native_client. However since the libjingle can depend on neither of them, here comes this patch. We hope to take this patch as a chance to get some advices on how should we handle this case.
BUGS=none
TEST=none
Review URL: http://codereview.chromium.org/8251003
TBR=ronghuawu@google.com
Review URL: http://codereview.chromium.org/8353030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/jsoncpp/README.chromium | 9 | ||||
-rw-r--r-- | third_party/jsoncpp/jsoncpp.gyp | 45 |
2 files changed, 0 insertions, 54 deletions
diff --git a/third_party/jsoncpp/README.chromium b/third_party/jsoncpp/README.chromium deleted file mode 100644 index 9b5a0f5..0000000 --- a/third_party/jsoncpp/README.chromium +++ /dev/null @@ -1,9 +0,0 @@ -Name: jsoncpp -URL: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp -Version: 246 -License File: LICENSE -Security Critical: yes - -Description: -The libjingle/webrtc uses jsoncpp for signaling message serialization and deserialization. - diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp deleted file mode 100644 index bb323ef..0000000 --- a/third_party/jsoncpp/jsoncpp.gyp +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2011 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. - -{ - 'targets': [ - { - 'target_name': 'jsoncpp', - 'type': 'static_library', - 'defines': [ - 'JSON_USE_EXCEPTION=0', - ], - 'sources': [ - 'source/include/json/assertions.h', - 'source/include/json/autolink.h', - 'source/include/json/config.h', - 'source/include/json/features.h', - 'source/include/json/forwards.h', - 'source/include/json/json.h', - 'source/include/json/reader.h', - 'source/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', - 'source/src/lib_json/json_writer.cpp', - ], - 'include_dirs': [ - 'source/include/', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'source/include/', - ], - }, - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: |