From 58772e95f9aa660ea7004f881f64601698c1cc99 Mon Sep 17 00:00:00 2001 From: Nick Bourdakos Date: Thu, 4 May 2023 11:23:00 -0700 Subject: [PATCH] Internal change PiperOrigin-RevId: 529464527 --- connections/implementation/BUILD | 5 +++- connections/implementation/mediums/BUILD | 8 ++---- .../implementation/mediums/webrtc/BUILD | 26 +++++++++---------- internal/platform/BUILD | 13 +++++----- internal/platform/implementation/BUILD | 8 ++---- internal/platform/implementation/g3/BUILD | 17 ++++++------ 6 files changed, 34 insertions(+), 43 deletions(-) diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD index 9cb96f4d..e0b8c2cf 100644 --- a/connections/implementation/BUILD +++ b/connections/implementation/BUILD @@ -121,7 +121,10 @@ cc_library( "wifi_lan_endpoint_channel.h", "wifi_lan_service_info.h", ], - copts = ["-DCORE_ADAPTER_DLL"] + ["-DNO_WEBRTC"], + copts = [ + "-DCORE_ADAPTER_DLL", + "-DNO_WEBRTC", + ], visibility = [ "//connections:__pkg__", "//connections/implementation/fuzzers:__pkg__", diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index e4885ae3..fd476896 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -57,6 +57,7 @@ cc_library( "//internal/platform:types", "//internal/platform:uuid", "//proto/mediums:web_rtc_signaling_frames_cc_proto", + # TODO: Support WebRTC "@com_google_absl//absl/container:btree", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -65,12 +66,7 @@ cc_library( "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/time", "@com_google_absl//absl/types:optional", - ] + select({ - "@platforms//cpu:arm": [], - "//conditions:default": [ - # TODO: Support WebRTC - ], - }), + ], ) cc_library( diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index fa453148..71e5abd2 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -26,7 +26,10 @@ cc_library( "session_description_wrapper.h", "signaling_frames.h", ], - copts = ["-DCORE_ADAPTER_DLL"] + ["-DNO_WEBRTC"], + copts = [ + "-DCORE_ADAPTER_DLL", + "-DNO_WEBRTC", + ], visibility = [ "//connections/implementation:__subpackages__", ], @@ -39,14 +42,10 @@ cc_library( "//internal/platform:logging", "//internal/platform:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", + # TODO: Support WebRTC "@com_google_absl//absl/memory", "@com_google_absl//absl/time", - ] + select({ - "@platforms//cpu:arm": [], - "//conditions:default": [ - # TODO: Support WebRTC - ], - }), + ], ) cc_library( @@ -57,7 +56,10 @@ cc_library( hdrs = [ "webrtc_socket_impl.h", ], - copts = ["-DCORE_ADAPTER_DLL"] + ["-DNO_WEBRTC"], + copts = [ + "-DCORE_ADAPTER_DLL", + "-DNO_WEBRTC", + ], visibility = [ "//connections/implementation:__subpackages__", ], @@ -65,12 +67,8 @@ cc_library( "//connections:core_types", "//internal/platform:base", "//internal/platform:types", - ] + select({ - "@platforms//cpu:arm": [], - "//conditions:default": [ - # TODO: Support WebRTC - ], - }), + # TODO: Support WebRTC + ], ) cc_test( diff --git a/internal/platform/BUILD b/internal/platform/BUILD index c29cd3f2..4b9be297 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -403,7 +403,10 @@ cc_library( "wifi_lan.h", "wifi_utils.h", ], - copts = ["-DCORE_ADAPTER_DLL"] + ["-DNO_WEBRTC"], + copts = [ + "-DCORE_ADAPTER_DLL", + "-DNO_WEBRTC", + ], visibility = [ "//connections:__subpackages__", "//fastpair:__subpackages__", @@ -420,18 +423,14 @@ cc_library( "//internal/base", "//internal/platform/implementation:comm", "//internal/platform/implementation:platform", + # TODO: Support WebRTC "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", - ] + select({ - "@platforms//cpu:arm": [], - "//conditions:default": [ - # TODO: Support WebRTC - ], - }), + ], ) cc_test( diff --git a/internal/platform/implementation/BUILD b/internal/platform/implementation/BUILD index 11f72960..7c323b4f 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -93,18 +93,14 @@ cc_library( "//internal/platform:uuid", "//internal/proto:credential_cc_proto", "//internal/proto:local_credential_cc_proto", + # TODO: Support WebRTC "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", - ] + select({ - "@platforms//cpu:arm": [], - "//conditions:default": [ - # TODO: Support WebRTC - ], - }), + ], ) cc_library( diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index 8dc1300b..bd6e10af 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -88,6 +88,13 @@ cc_library( visibility = ["//visibility:private"], deps = [ ":types", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/synchronization", "//internal/platform:base", "//internal/platform:cancellation_flag", "//internal/platform:logging", @@ -96,17 +103,9 @@ cc_library( "//internal/platform/implementation:comm", "//internal/platform/implementation/shared:count_down_latch", "//internal/proto:credential_cc_proto", - "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory", # buildcleaner: keep - "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", + # TODO: Support WebRTC "//third_party/webrtc/files/stable/webrtc/api/task_queue:default_task_queue_factory", "//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", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", ], )