diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 00:22:02 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 00:22:02 +0000 |
| commit | 5f64cdc6a1e3c1e5de9433db2a48473a31c0097d (patch) | |
| tree | cd5e9d02f783c41c5ff902f62d2b2d79e85e0e5f /ppapi | |
| parent | ee011009fd36781e3da02dbed0df3df39c215ff4 (diff) | |
| download | chromium_src-5f64cdc6a1e3c1e5de9433db2a48473a31c0097d.zip chromium_src-5f64cdc6a1e3c1e5de9433db2a48473a31c0097d.tar.gz chromium_src-5f64cdc6a1e3c1e5de9433db2a48473a31c0097d.tar.bz2 | |
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
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/manifest.cc | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/manifest.h | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.gyp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/manifest.cc b/ppapi/native_client/src/trusted/plugin/manifest.cc index ddf4880..b3133f7 100644 --- a/ppapi/native_client/src/trusted/plugin/manifest.cc +++ b/ppapi/native_client/src/trusted/plugin/manifest.cc @@ -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 { diff --git a/ppapi/native_client/src/trusted/plugin/manifest.h b/ppapi/native_client/src/trusted/plugin/manifest.h index 73d42bd..48bdfc8 100644 --- a/ppapi/native_client/src/trusted/plugin/manifest.h +++ b/ppapi/native_client/src/trusted/plugin/manifest.h @@ -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; diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp index a74fb92..bfecdd7 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.gyp +++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp @@ -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"', { |