diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 03:27:27 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 03:27:27 +0000 |
| commit | d4169cb3001df204b9ce03876d56839f5820c5a7 (patch) | |
| tree | 0b2761b2574feee8abe62f3f17efc46fc0a1cc96 /remoting | |
| parent | 9ade0a0cfed90f3026d323203b0b6a7bd6cdcb6a (diff) | |
| download | chromium_src-d4169cb3001df204b9ce03876d56839f5820c5a7.zip chromium_src-d4169cb3001df204b9ce03876d56839f5820c5a7.tar.gz chromium_src-d4169cb3001df204b9ce03876d56839f5820c5a7.tar.bz2 | |
Remove files that are compiled in both media.gyp and remoting.gyp.
This causes problems when linking because there are duplicate symbols
when the same file is compiled into two libs. Previously we were letting
the linker collapse these, but that's slow and will start throwing errors
once gyp is rolled.
Review URL: http://codereview.chromium.org/7047021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index e616fbc..1203522 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -102,6 +102,7 @@ 'remoting_base', 'remoting_client', 'remoting_jingle_glue', + '../media/media.gyp:yuv_convert', '../ppapi/ppapi.gyp:ppapi_cpp_objects', # TODO(sergeyu): This is a hack: plugin should not depend on @@ -130,12 +131,6 @@ 'client/plugin/pepper_util.h', 'client/plugin/pepper_xmpp_proxy.cc', 'client/plugin/pepper_xmpp_proxy.h', - '../media/base/yuv_convert.cc', - '../media/base/yuv_convert.h', - '../media/base/yuv_row.h', - '../media/base/yuv_row_table.cc', - '../media/base/yuv_row_win.cc', - '../media/base/yuv_row_posix.cc', ], }, # end of target 'remoting_client_plugin' { |