From d4169cb3001df204b9ce03876d56839f5820c5a7 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Fri, 20 May 2011 03:27:27 +0000 Subject: 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 --- remoting/remoting.gyp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'remoting') 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' { -- cgit v1.1