| Index: webrtc/media/media.gyp
|
| diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
|
| index 2eb72710d9199c76d97d2c050f45ea6ae415c221..649b319d8db17fa777cf6224c1b424fac4904b43 100644
|
| --- a/webrtc/media/media.gyp
|
| +++ b/webrtc/media/media.gyp
|
| @@ -61,10 +61,7 @@
|
| 'base/videocapturerfactory.h',
|
| 'base/videocommon.cc',
|
| 'base/videocommon.h',
|
| - 'base/videoframe.cc',
|
| 'base/videoframe.h',
|
| - 'base/videoframefactory.cc',
|
| - 'base/videoframefactory.h',
|
| 'base/videosourcebase.cc',
|
| 'base/videosourcebase.h',
|
| 'devices/videorendererfactory.h',
|
| @@ -85,10 +82,7 @@
|
| 'engine/webrtcvideoencoderfactory.h',
|
| 'engine/webrtcvideoengine2.cc',
|
| 'engine/webrtcvideoengine2.h',
|
| - 'engine/webrtcvideoframe.cc',
|
| 'engine/webrtcvideoframe.h',
|
| - 'engine/webrtcvideoframefactory.cc',
|
| - 'engine/webrtcvideoframefactory.h',
|
| 'engine/webrtcvoe.h',
|
| 'engine/webrtcvoiceengine.cc',
|
| 'engine/webrtcvoiceengine.h',
|
| @@ -139,7 +133,7 @@
|
| 'HAVE_WEBRTC_VIDEO',
|
| 'HAVE_WEBRTC_VOICE',
|
| ],
|
| - 'direct_dependent_settings': {
|
| + 'all_dependent_settings': {
|
| 'defines': [
|
| 'HAVE_WEBRTC_VIDEO',
|
| 'HAVE_WEBRTC_VOICE',
|
| @@ -274,14 +268,11 @@
|
| 'base/videocapturer_unittest.cc',
|
| 'base/videocommon_unittest.cc',
|
| 'base/videoengine_unittest.h',
|
| - 'base/videoframe_unittest.h',
|
| 'engine/nullwebrtcvideoengine_unittest.cc',
|
| 'engine/payload_type_mapper_unittest.cc',
|
| 'engine/simulcast_unittest.cc',
|
| 'engine/webrtcmediaengine_unittest.cc',
|
| 'engine/webrtcvideocapturer_unittest.cc',
|
| - 'engine/webrtcvideoframe_unittest.cc',
|
| - 'engine/webrtcvideoframefactory_unittest.cc',
|
| 'engine/webrtcvideoengine2_unittest.cc',
|
| 'engine/webrtcvoiceengine_unittest.cc',
|
| 'sctp/sctpdataengine_unittest.cc',
|
|
|