Change the native_client to use the third_party/jsoncpp.

BUG=102448
TEST=Compiles

Review URL: http://codereview.chromium.org/8524002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109737 0039d316-1c4b-4281-b951-d872f2087c98
parent ee011009
......@@ -17,9 +17,9 @@
#include "native_client/src/shared/platform/nacl_check.h"
#include "native_client/src/trusted/plugin/plugin_error.h"
#include "native_client/src/trusted/plugin/utility.h"
#include "native_client/src/third_party_mod/jsoncpp/include/json/reader.h"
#include "ppapi/cpp/dev/url_util_dev.h"
#include "ppapi/cpp/var.h"
#include "third_party/jsoncpp/source/include/json/reader.h"
namespace plugin {
......
......@@ -15,7 +15,7 @@
#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/nacl_string.h"
#include "native_client/src/third_party_mod/jsoncpp/include/json/value.h"
#include "third_party/jsoncpp/source/include/json/value.h"
namespace pp {
class URLUtil_Dev;
......
......@@ -97,7 +97,6 @@
'<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
'<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
'<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
'<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
'<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
'<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
......@@ -107,6 +106,7 @@
'<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
'<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
'conditions': [
['OS=="mac"', {
......
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