diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 14:02:25 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 14:02:25 +0000 |
| commit | e0834db611c7fe73b896dc9f415bf9223890fa9e (patch) | |
| tree | f7bd3d9fcb9318cee1268acf9fc0bc479dddff8c /ppapi | |
| parent | 09dee82dc3d2911dc3d0004a75f20ca31285f5d3 (diff) | |
| download | chromium_src-e0834db611c7fe73b896dc9f415bf9223890fa9e.zip chromium_src-e0834db611c7fe73b896dc9f415bf9223890fa9e.tar.gz chromium_src-e0834db611c7fe73b896dc9f415bf9223890fa9e.tar.bz2 | |
Pepper: Remove jsoncpp from trusted plugin.
Now that manifest parsing has been moved to components/nacl, the trusted plugin
no longer depends on jsoncpp.
BUG=239656
R=dmichael@chromium.org
Review URL: https://codereview.chromium.org/291173007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/DEPS | 1 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.gyp | 1 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/pnacl_resources.cc | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/DEPS b/ppapi/native_client/src/trusted/plugin/DEPS index f92c0b3..1468e68 100644 --- a/ppapi/native_client/src/trusted/plugin/DEPS +++ b/ppapi/native_client/src/trusted/plugin/DEPS @@ -6,5 +6,4 @@ include_rules = [ "+native_client/src/trusted/reverse_service/reverse_service.h", "+native_client/src/trusted/service_runtime/include", "+native_client/src/trusted/service_runtime/nacl_error_code.h", - "+third_party/jsoncpp", ] diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp index c932c2c..343883d 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.gyp +++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp @@ -72,7 +72,6 @@ '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service', '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref', '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', ], 'conditions': [ ['OS=="mac"', { diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc index 1f0f8f4..7f2c518 100644 --- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc +++ b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc @@ -11,8 +11,6 @@ #include "ppapi/native_client/src/trusted/plugin/plugin.h" #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" #include "ppapi/native_client/src/trusted/plugin/utility.h" -#include "third_party/jsoncpp/source/include/json/reader.h" -#include "third_party/jsoncpp/source/include/json/value.h" namespace plugin { |