From e4f25b54c69ae9945fdf3e252c7a7c4590e3fd82 Mon Sep 17 00:00:00 2001 From: Nick Bourdakos Date: Thu, 21 May 2026 18:00:08 -0700 Subject: [PATCH] Internal PiperOrigin-RevId: 919352057 --- connections/implementation/BUILD | 5 +--- connections/implementation/mediums/BUILD | 2 -- .../implementation/mediums/webrtc/BUILD | 29 +++++++++---------- internal/platform/BUILD | 5 +--- internal/platform/implementation/BUILD | 6 ++-- internal/platform/implementation/apple/BUILD | 10 +++---- internal/platform/implementation/g3/BUILD | 10 ++++--- .../platform/implementation/windows/BUILD | 16 +++++----- 8 files changed, 37 insertions(+), 46 deletions(-) diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD index 9f820647..b3bbee2d 100644 --- a/connections/implementation/BUILD +++ b/connections/implementation/BUILD @@ -219,10 +219,7 @@ cc_library( "service_controller_router.h", "wifi_lan_service_info.h", ], - copts = [ - "-DCORE_ADAPTER_DLL", - "-DNO_WEBRTC", - ], + copts = ["-DCORE_ADAPTER_DLL"], visibility = [ "//chrome/chromeos/assistant/data_migration/lib:__pkg__", "//connections:__pkg__", diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index 2bb183de..29007461 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -64,7 +64,6 @@ cc_library( "wifi_lan_bwu_handler.h", "wifi_lan_endpoint_channel.h", ], - copts = ["-DNO_WEBRTC"], local_defines = select({ "//:webrtc_enabled": [], "//conditions:default": ["NO_WEBRTC"], @@ -155,7 +154,6 @@ cc_library( name = "utils", srcs = ["utils.cc"], hdrs = ["utils.h"], - copts = ["-DNO_WEBRTC"], visibility = [ "//connections/implementation:__pkg__", "//connections/implementation/mediums/advertisements:__pkg__", diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index 435ed413..dfca3a94 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -23,11 +23,10 @@ cc_library( "local_ice_candidate_listener.h", "session_description_wrapper.h", ], - copts = ["-DNO_WEBRTC"], deps = [ "//connections/implementation/mediums:webrtc_socket", "//internal/platform:base", - # "//third_party/webrtc/files/stable/webrtc/api:jsep", + "//third_party/webrtc/files/stable/webrtc/api:jsep", "@com_google_absl//absl/functional:any_invocable", ], ) @@ -45,11 +44,11 @@ cc_library( "//internal/platform:comm", "//internal/platform:logging", "//internal/platform:types", - # "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", - # "//third_party/webrtc/files/stable/webrtc/api:jsep", - # "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", - # "//third_party/webrtc/files/stable/webrtc/api:rtc_error", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", + "//third_party/webrtc/files/stable/webrtc/api:jsep", + "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", + "//third_party/webrtc/files/stable/webrtc/api:rtc_error", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "//third_party/webrtc/files/stable/webrtc/rtc_base:network_constants", "//third_party/webrtc/files/stable/webrtc/rtc_base:refcount", "//third_party/webrtc/files/stable/webrtc/rtc_base:threading", @@ -68,7 +67,7 @@ cc_library( "//connections/implementation/mediums:webrtc_peer_id", "//internal/platform:base", "//proto/mediums:web_rtc_signaling_frames_cc_proto", - # "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", + "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", ], ) @@ -81,8 +80,8 @@ cc_library( "//internal/platform:base", "//internal/platform:logging", "//internal/platform:types", - # "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/strings:string_view", ], @@ -94,7 +93,7 @@ cc_library( deps = [ "//internal/platform:base", "//internal/platform/implementation:webrtc_platform", - # "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", + "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/files/stable/webrtc/rtc_base:network_constants", "@com_google_absl//absl/strings:string_view", ], @@ -134,7 +133,7 @@ cc_library( "//internal/platform:logging", "//internal/platform:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", - # "//third_party/webrtc/files/stable/webrtc/api:jsep", + "//third_party/webrtc/files/stable/webrtc/api:jsep", "//third_party/webrtc/files/stable/webrtc/rtc_base:network_constants", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:nullability", @@ -186,9 +185,9 @@ cc_test( "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation:platform_impl", - # "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", - # "//third_party/webrtc/files/stable/webrtc/api:jsep", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", + "//third_party/webrtc/files/stable/webrtc/api:jsep", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "//third_party/webrtc/files/stable/webrtc/rtc_base:network_constants", "//third_party/webrtc/files/stable/webrtc/rtc_base:refcount", "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/internal/platform/BUILD b/internal/platform/BUILD index 76beadde..2e56b1d8 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -340,10 +340,7 @@ cc_library( "wifi_hotspot.h", "wifi_lan.h", ], - copts = [ - "-DCORE_ADAPTER_DLL", - "-DNO_WEBRTC", - ], + copts = ["-DCORE_ADAPTER_DLL"], visibility = [ "//connections:__subpackages__", "//internal/platform/implementation:__subpackages__", diff --git a/internal/platform/implementation/BUILD b/internal/platform/implementation/BUILD index 65ed9747..22a42037 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -100,8 +100,8 @@ cc_library( deps = [ "//connections/implementation/proto:offline_wire_formats_cc_proto", "//internal/platform:base", - # "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/strings:string_view", ], @@ -125,7 +125,6 @@ cc_library( "wifi_hotspot.h", "wifi_lan.h", ], - copts = ["-DNO_WEBRTC"], visibility = [ "//connections/implementation:__subpackages__", "//internal/network:__subpackages__", @@ -157,7 +156,6 @@ cc_library( hdrs = [ "platform.h", ], - defines = ["NO_WEBRTC"], visibility = [ "//connections/implementation:__subpackages__", "//internal:__subpackages__", diff --git a/internal/platform/implementation/apple/BUILD b/internal/platform/implementation/apple/BUILD index 7c48f36b..35b153f3 100644 --- a/internal/platform/implementation/apple/BUILD +++ b/internal/platform/implementation/apple/BUILD @@ -61,17 +61,17 @@ objc_library( "webrtc.h", ], deps = [ - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "//third_party/apple_frameworks:Foundation", "//internal/platform:logging", "//internal/platform:tachyon_express_signaling_messenger", "//internal/platform:types", "//internal/platform/implementation:webrtc_platform", "//internal/proto:tachyon_cc_proto", - # "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", - # "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", + "//third_party/apple_frameworks:Foundation", + "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", + "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", "//third_party/webrtc/files/stable/webrtc/api/task_queue:default_task_queue_factory", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", ], ) diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index b50a8ea8..935599c0 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -85,6 +85,7 @@ cc_library( "bluetooth_adapter.cc", "bluetooth_classic.cc", "credential_storage_impl.cc", + "webrtc.cc", "wifi_direct.cc", "wifi_hotspot.cc", "wifi_lan.cc", @@ -96,6 +97,7 @@ cc_library( "bluetooth_classic.h", "credential_storage_impl.h", "socket_base.h", + "webrtc.h", "wifi.h", "wifi_direct.h", "wifi_hotspot.h", @@ -115,9 +117,10 @@ cc_library( "//internal/platform/implementation:webrtc_platform", "//internal/platform/implementation:wifi_utils", "//internal/proto:credential_cc_proto", - # "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", - # "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", + "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/rtc_base:checks", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -180,7 +183,6 @@ cc_library( "platform.cc", "webrtc_platform.cc", ], - defines = ["NO_WEBRTC"], visibility = [ "//connections:__subpackages__", "//connections:partners", diff --git a/internal/platform/implementation/windows/BUILD b/internal/platform/implementation/windows/BUILD index 7cc639f6..860165bb 100644 --- a/internal/platform/implementation/windows/BUILD +++ b/internal/platform/implementation/windows/BUILD @@ -241,10 +241,10 @@ cc_library( "//internal/platform:logging", "//internal/platform:tachyon_express_signaling_messenger", "//internal/platform/implementation:comm", - # "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", - # "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", - # "//third_party/webrtc/files/stable/webrtc/api:rtc_error", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:create_modular_peer_connection_factory", + "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", + "//third_party/webrtc/files/stable/webrtc/api:rtc_error", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "//third_party/webrtc/files/stable/webrtc/rtc_base:threading", "@com_google_absl//absl/strings", ], @@ -444,10 +444,10 @@ cc_test( ":webrtc", "//internal/platform/implementation:comm", "//internal/platform/implementation:platform_impl", - # "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", - # "//third_party/webrtc/files/stable/webrtc/api:jsep", - # "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", - # "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", + "//third_party/webrtc/files/stable/webrtc/api:data_channel_interface", + "//third_party/webrtc/files/stable/webrtc/api:jsep", + "//third_party/webrtc/files/stable/webrtc/api:peer_connection_interface", + "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ],