Bug 1647368 - Update build files; r=ng
authorDan Minor <dminor@mozilla.com>
Mon, 22 Jun 2020 21:10:05 +0000
changeset 536931 15b1fa8da2c0d169ba36da0316be279f620604bb
parent 536930 46a19c43afb4064498add86de3ec21ad09fd7bcf
child 536932 8ebb2f104016eef0301afbc8aa57cbd9e8e676db
push id37533
push userdluca@mozilla.com
push dateTue, 23 Jun 2020 21:38:40 +0000
treeherdermozilla-central@d48aa0f0aa0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersng
bugs1647368
milestone79.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1647368 - Update build files; r=ng Depends on D80545 Differential Revision: https://phabricator.services.mozilla.com/D80546
dom/media/systemservices/moz.build
media/webrtc/trunk/webrtc/modules/video_capture/BUILD.gn
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -25,16 +25,26 @@ if CONFIG['MOZ_WEBRTC']:
         '/media/webrtc/trunk/webrtc',
     ]
 
     if CONFIG['OS_TARGET'] == 'Android':
         UNIFIED_SOURCES += [
             'android_video_capture/device_info_android.cc',
             'android_video_capture/video_capture_android.cc',
         ]
+    elif CONFIG['OS_TARGET'] == 'Darwin':
+        UNIFIED_SOURCES += [
+            'objc_video_capture/device_info.mm',
+            'objc_video_capture/device_info_objc.mm',
+            'objc_video_capture/rtc_video_capture_objc.mm',
+            'objc_video_capture/video_capture.mm',
+        ]
+        CMMFLAGS += [
+            '-fobjc-arc',
+        ]
 
     if CONFIG['OS_TARGET'] != 'Android':
         UNIFIED_SOURCES += [
             'video_engine/desktop_capture_impl.cc',
             'video_engine/platform_uithread.cc',
         ]
 
 
--- a/media/webrtc/trunk/webrtc/modules/video_capture/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/BUILD.gn
@@ -82,53 +82,16 @@ if (!build_with_chromium) {
         "-Wno-missing-braces",
         "-Wno-overloaded-virtual",
         "-Wno-reorder",
         "-Wno-writable-strings",
       ]
     }
   }
 
-  if (is_ios || is_mac) {
-    rtc_source_set("video_capture_internal_impl_objc") {
-      visibility = [ ":video_capture_internal_impl" ]
-      configs += [ ":video_capture_internal_impl_warnings_config" ]
-
-      deps = [
-        ":video_capture_module",
-        "../../rtc_base:rtc_base_approved",
-        "../../system_wrappers",
-      ]
-
-      sources = [
-        "objc/device_info.h",
-        "objc/device_info.mm",
-        "objc/device_info_objc.h",
-        "objc/device_info_objc.mm",
-        "objc/rtc_video_capture_objc.h",
-        "objc/rtc_video_capture_objc.mm",
-        "objc/video_capture.h",
-        "objc/video_capture.mm",
-      ]
-
-      all_dependent_configs = [ ":video_capture_internal_impl_config" ]
-
-      if (!build_with_chromium && is_clang) {
-        # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-        suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-      }
-
-      if (build_with_mozilla) {
-        cflags = [
-          "-fobjc-arc",  # CLANG_ENABLE_OBJC_ARC = YES.
-        ]
-      }
-    }
-  }
-
   rtc_source_set("video_capture_internal_impl") {
     configs += [ ":video_capture_internal_impl_warnings_config" ]
 
     deps = [
       ":video_capture_module",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
     ]
@@ -156,19 +119,16 @@ if (!build_with_chromium) {
         "windows/video_capture_ds.cc",
         "windows/video_capture_ds.h",
         "windows/video_capture_factory_windows.cc",
       ]
 
       libs = [ "Strmiids.lib" ]
 
     }
-    if (is_ios || is_mac) {
-      deps += [ ":video_capture_internal_impl_objc" ]
-    }
 
     all_dependent_configs = [ ":video_capture_internal_impl_config" ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }