summaryrefslogtreecommitdiffstats
path: root/remoting/remoting.gyp
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 20:19:44 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 20:19:44 +0000
commitf51ffcf1fa06f12c96cc3bcb6c0659c65371fe81 (patch)
tree73cf0fc1db209096852914e7ea719d217cf0ad08 /remoting/remoting.gyp
parent482a2662398a751f1a231b1ef84f19de91ee3764 (diff)
downloadchromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.zip
chromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.tar.gz
chromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.tar.bz2
Revert r51857 "Integrating back into using the external ppapi/cpp wrappers."
For some reason, this looks like it breaks all PPAPI ui tests on linux. TBR: tonyg git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r--remoting/remoting.gyp5
1 files changed, 1 insertions, 4 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index c1450c1..82df802 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -71,8 +71,7 @@
'chromoting_base',
'chromoting_client',
'chromoting_jingle_glue',
- '../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects',
- '../third_party/zlib/zlib.gyp:zlib',
+ '../third_party/ppapi/ppapi.gyp:ppapi_c',
],
'sources': [
'client/plugin/chromoting_plugin.cc',
@@ -81,8 +80,6 @@
'client/plugin/pepper_entrypoints.h',
'client/plugin/pepper_view.cc',
'client/plugin/pepper_view.h',
- 'client/plugin/pepper_util.cc',
- 'client/plugin/pepper_util.h',
'../media/base/yuv_convert.cc',
'../media/base/yuv_convert.h',
'../media/base/yuv_row.h',