Bug 1552755 - Update moz.build files; r=ng

Depends on D33339 Differential Revision: https://phabricator.services.mozilla.com/D33340
Brli · May 31, 2019 · a30fb75 · a30fb75
1 parent df949ba
commit a30fb75
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build
@@ -54,7 +54,6 @@ webrtc_non_unified_sources = [
     'trunk/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc',                 # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
     'trunk/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc',                 # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
     'trunk/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc',                  # Because of identically named constant kRedForFecHeaderLength in an anonymous namespace
-    'trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',                 # Because it locally defines NS_IF_ADDREF/RELEASE
     'trunk/webrtc/modules/video_capture/windows/device_info_ds.cc',              # Because of the MEDIASUBTYPE_HDYC variable
     'trunk/webrtc/modules/video_capture/windows/help_functions_ds.cc',           # Because of initguid.h
     'trunk/webrtc/modules/video_capture/windows/sink_filter_ds.cc',              # Because of the MEDIASUBTYPE_HDYC variable and initguid.h

diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
@@ -178,20 +178,14 @@ if CONFIG["OS_TARGET"] == "WINNT":
     ]
 
     SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp",
         "/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc",
         "/media/webrtc/trunk/webrtc/modules/video_capture/windows/help_functions_ds.cc",
         "/media/webrtc/trunk/webrtc/modules/video_capture/windows/sink_filter_ds.cc"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp",
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp",
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_mf.cc",
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp",
         "/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_ds.cc",
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc",
-        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_mf.cc"
+        "/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc"
     ]
 
 if CONFIG["CPU_ARCH"] == "aarch64":