Bug 1496359 - Update moz.build file; r=ng
authorDan Minor <dminor@mozilla.com>
Mon, 15 Apr 2019 17:43:54 +0000
changeset 469873 ae4456baac247fa25dcdc82dfb7f61333e2dfb21
parent 469872 7ff592d37e6c9e45eaa030f0c9ef696d8defcea5
child 469874 6ca18bea93f98ab75039124ea58795d09b05a19e
push id35883
push userbtara@mozilla.com
push dateWed, 17 Apr 2019 21:47:29 +0000
treeherdermozilla-central@02b89c29412b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersng
bugs1496359
milestone68.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 1496359 - Update moz.build file; r=ng Depends on D27372 Differential Revision: https://phabricator.services.mozilla.com/D27373
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
@@ -98,28 +98,31 @@ if CONFIG["OS_TARGET"] == "DragonFly":
         "Xdamage",
         "Xext",
         "Xfixes",
         "Xi",
         "Xrender"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_finder_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/window_list_utils.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_atom_cache.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/desktop_device_info_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_display.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_util.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_finder_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_list_utils.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
 if CONFIG["OS_TARGET"] == "FreeBSD":
 
     DEFINES["USE_X11"] = "1"
     DEFINES["WEBRTC_BSD"] = True
     DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -133,28 +136,31 @@ if CONFIG["OS_TARGET"] == "FreeBSD":
         "Xdamage",
         "Xext",
         "Xfixes",
         "Xi",
         "Xrender"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_finder_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/window_list_utils.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_atom_cache.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/desktop_device_info_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_display.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_util.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_finder_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_list_utils.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
 if CONFIG["OS_TARGET"] == "Linux":
 
     DEFINES["USE_NSS_CERTS"] = "1"
     DEFINES["USE_X11"] = "1"
     DEFINES["WEBRTC_LINUX"] = True
     DEFINES["WEBRTC_POSIX"] = True
@@ -170,28 +176,31 @@ if CONFIG["OS_TARGET"] == "Linux":
         "Xdamage",
         "Xext",
         "Xfixes",
         "Xi",
         "Xrender"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_finder_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/window_list_utils.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_atom_cache.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/desktop_device_info_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_display.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_util.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_finder_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_list_utils.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
 if CONFIG["OS_TARGET"] == "NetBSD":
 
     DEFINES["USE_X11"] = "1"
     DEFINES["WEBRTC_BSD"] = True
     DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -205,28 +214,31 @@ if CONFIG["OS_TARGET"] == "NetBSD":
         "Xdamage",
         "Xext",
         "Xfixes",
         "Xi",
         "Xrender"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_finder_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/window_list_utils.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_atom_cache.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/desktop_device_info_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_display.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_util.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_finder_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_list_utils.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
 if CONFIG["OS_TARGET"] == "OpenBSD":
 
     DEFINES["USE_X11"] = "1"
     DEFINES["WEBRTC_BSD"] = True
     DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -240,28 +252,31 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
         "Xdamage",
         "Xext",
         "Xfixes",
         "Xi",
         "Xrender"
     ]
 
     UNIFIED_SOURCES += [
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_finder_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/window_list_utils.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_atom_cache.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/desktop_device_info_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_display.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/shared_x_util.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_finder_x11.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_list_utils.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_atom_cache.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_error_trap.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
 if CONFIG["OS_TARGET"] == "WINNT":
 
     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
     DEFINES["NOMINMAX"] = True
     DEFINES["NO_TCMALLOC"] = True
     DEFINES["NTDDI_VERSION"] = "0x0A000000"