diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 20:17:17 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 20:17:17 +0000 |
| commit | e80bdfb2a317f94642d79cb21e65acfc3a36fb0d (patch) | |
| tree | 80d18350b2827f748d5f4e544e0f70da5066837d /ppapi/native_client | |
| parent | bd4e2b21a189516a014561e4250bbf39be68cefc (diff) | |
| download | chromium_src-e80bdfb2a317f94642d79cb21e65acfc3a36fb0d.zip chromium_src-e80bdfb2a317f94642d79cb21e65acfc3a36fb0d.tar.gz chromium_src-e80bdfb2a317f94642d79cb21e65acfc3a36fb0d.tar.bz2 | |
Remove stale references to private NaCl copy of PPAPI
This CL s a trivial change that bumps the DEPS to NaCl to bring
in NaCl side cleanups and removes Chrome side stale references to
XXX_nacl versions of the PPAPI libraries which were private to
NaCl.
TEST= try
BUG= none
R= brettw@chromium.org
Review URL: http://codereview.chromium.org/8346011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.gyp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp index 88e682e..b071b0a 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp @@ -65,7 +65,7 @@ '<(DEPTH)/ppapi', ], 'dependencies': [ - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_c_nacl', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', ], }, ], diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp index c60d682..a74fb92 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.gyp +++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp @@ -63,8 +63,6 @@ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_cpp_nacl', - '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp', @@ -75,6 +73,8 @@ '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service', '<(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/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', ], }], }], @@ -96,8 +96,6 @@ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_cpp_nacl', - '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', '<(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', @@ -107,6 +105,8 @@ '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service', '<(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/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', ], 'conditions': [ ['OS=="mac"', { |