Skip to content

Commit

Permalink
Bug 1822194 - Vendor libwebrtc from b21c979691 - moz.build file updates
Browse files Browse the repository at this point in the history
mfromanmoz committed Apr 10, 2023
1 parent 9b9af02 commit 0926b29
Showing 4 changed files with 106 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
Original file line number Diff line number Diff line change
@@ -23,4 +23,4 @@
# don't change CLOBBER for WebIDL changes any more.


Merge day clobber 2023-04-10
Modified build files in third_party/libwebrtc - Bug 1822194 - Vendor libwebrtc from b21c979691
Original file line number Diff line number Diff line change
@@ -265,14 +265,11 @@ if CONFIG["CPU_ARCH"] == "arm":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/pipewire_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc"
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
]

if CONFIG["CPU_ARCH"] == "ppc64":
@@ -343,14 +340,11 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/pipewire_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc"
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
]

if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
@@ -380,14 +374,11 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/pipewire_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc"
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
]

if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
@@ -413,14 +404,11 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/pipewire_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc"
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
]

if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
97 changes: 97 additions & 0 deletions third_party/libwebrtc/modules/portal/portal_gn/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.


### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
### DO NOT edit it by hand. ###

COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()

DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
DEFINES["USE_AURA"] = "1"
DEFINES["USE_GLIB"] = "1"
DEFINES["USE_NSS_CERTS"] = "1"
DEFINES["USE_OZONE"] = "1"
DEFINES["USE_UDEV"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_LINUX"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_GNU_SOURCE"] = True
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True

FINAL_LIBRARY = "webrtc"


LOCAL_INCLUDES += [
"!/ipc/ipdl/_ipdlheaders",
"!/third_party/libwebrtc/gen",
"/gfx/angle/checkout/include/",
"/ipc/chromium/src",
"/third_party/drm/drm/",
"/third_party/drm/drm/include/",
"/third_party/drm/drm/include/libdrm/",
"/third_party/gbm/gbm/",
"/third_party/libepoxy/libepoxy/include/",
"/third_party/libwebrtc/",
"/third_party/libwebrtc/third_party/abseil-cpp/",
"/third_party/pipewire/",
"/tools/profiler/public"
]

UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/portal/pipewire_utils.cc",
"/third_party/libwebrtc/modules/portal/scoped_glib.cc",
"/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc"
]

if not CONFIG["MOZ_DEBUG"]:

DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
DEFINES["NDEBUG"] = True
DEFINES["NVALGRIND"] = True

if CONFIG["MOZ_DEBUG"] == "1":

DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
DEFINES["_DEBUG"] = True

if CONFIG["CPU_ARCH"] == "aarch64":

DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True

if CONFIG["CPU_ARCH"] == "arm":

CXXFLAGS += [
"-mfpu=neon"
]

DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_HAS_NEON"] = True

if CONFIG["CPU_ARCH"] == "x86":

CXXFLAGS += [
"-msse2"
]

if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["USE_X11"] = "1"

Library("portal_gn")
4 changes: 4 additions & 0 deletions third_party/libwebrtc/moz.build
Original file line number Diff line number Diff line change
@@ -580,6 +580,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/audio_coding/isac_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
@@ -600,6 +601,7 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/rtc_base/system/asm_defines_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
@@ -630,6 +632,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
@@ -650,6 +653,7 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",

0 comments on commit 0926b29

Please sign in to comment.