Internal flow change phase 2.

PiperOrigin-RevId: 427059704

connections/BUILD

@@ -73,7 +73,7 @@ cc_library(
         "//internal/platform:base",
         "//internal/platform:types",
         "//internal/platform:util",
-        "//proto:connections_enums_portable_proto",
+        "//proto:connections_enums_cc_proto",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:variant",
     ],
@@ -112,9 +112,10 @@ cc_test(
         "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:variant",
+        "@com_google_googletest//:gtest_main",
     ],
 )

connections/clients/windows/BUILD

@@ -28,11 +28,11 @@ cc_windows_dll(
     defines = ["CORE_ADAPTER_DLL"],
     tags = ["windows-dll"],
     deps = [
+        "//third_party/dart_lang/v2:dart_api_dl",
         "//connections:core",
         "//internal/platform/implementation/windows",
+        "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
         "@com_google_absl//absl/strings",
-        "//third_party/dart_lang/v2:dart_api_dl",
-        "//webrtc/api:create_peerconnection_factory",
     ],
 )
 
@@ -52,10 +52,10 @@ cc_windows_dll(
     defines = ["CORE_ADAPTER_DART_DLL"],
     tags = ["windows-dll"],
     deps = [
+        "//third_party/dart_lang/v2:dart_api_dl",
         "//connections:core",
         "//internal/platform/implementation/windows",
+        "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
         "@com_google_absl//absl/strings",
-        "//third_party/dart_lang/v2:dart_api_dl",
-        "//webrtc/api:create_peerconnection_factory",
     ],
 )

connections/implementation/BUILD

@@ -84,18 +84,19 @@ cc_library(
         "wifi_lan_service_info.h",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__pkg__",
         "//connections/implementation/fuzzers:__pkg__",
     ],
     deps = [
         ":message_lite",
+        ":ukey2",
         "//base",
         "//connections:core_types",
         "//connections/implementation/mediums",
         "//connections/implementation/mediums:utils",
-        "//connections/implementation/mediums/webrtc",
-        "//connections/implementation/proto:offline_wire_formats_portable_proto",
+        "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/analytics",
         "//internal/platform:base",
         "//internal/platform:cancellation_flag",
@@ -105,7 +106,7 @@ cc_library(
         "//internal/platform:types",
         "//internal/platform:util",
         "//internal/platform/implementation:comm",
-        "//proto:connections_enums_portable_proto",
+        "//proto:connections_enums_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_map",
@@ -115,7 +116,6 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:span",
-        ":ukey2",
     ],
 )
 
@@ -124,6 +124,7 @@ cc_library(
     hdrs = [
         "message_lite.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
     ],
@@ -145,6 +146,7 @@ cc_library(
         "offline_simulation_user.h",
         "simulation_user.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
     ],
@@ -154,9 +156,9 @@ cc_library(
         "//internal/platform:base",
         "//internal/platform:test_util",
         "//internal/platform:types",
-        "@com_google_googletest//:gtest_for_library_testonly",
         "@com_google_absl//absl/functional:bind_front",
         "@com_google_absl//absl/strings",
+        "@com_google_googletest//:gtest_for_library_testonly",
     ],
 )
 
@@ -176,7 +178,6 @@ cc_test(
         "endpoint_manager_test.cc",
         "injected_bluetooth_device_store_test.cc",
         "internal_payload_factory_test.cc",
-        "offline_frames_test.cc",
         "offline_frames_validator_test.cc",
         "offline_service_controller_test.cc",
         "p2p_cluster_pcp_handler_test.cc",
@@ -185,28 +186,30 @@ cc_test(
         "service_controller_router_test.cc",
         "wifi_lan_service_info_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     shard_count = 16,
     deps = [
         ":internal",
         ":internal_test",
+        ":ukey2",
         "//connections:core_types",
         "//connections/implementation/mediums",
         "//connections/implementation/mediums:utils",
-        "//connections/implementation/proto:offline_wire_formats_portable_proto",
+        "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/platform:base",
         "//internal/platform:comm",
         "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "//proto:connections_enums_portable_proto",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "//proto:connections_enums_cc_proto",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:span",
-        ":ukey2",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )

connections/implementation/fuzzers/BUILD

@@ -21,8 +21,8 @@ cc_fuzz_target(
     componentid = 148515,
     copts = ["-DCORE_ADAPTER_DLL"],
     deps = [
+        "//security/fuzzing/blaze:default_init_google_for_cc_fuzz_target",
         "//connections/implementation:internal",
         "//internal/platform:base",
-        "//security/fuzzing/blaze:default_init_google_for_cc_fuzz_target",
     ],
 )

connections/implementation/mediums/BUILD

@@ -21,7 +21,7 @@ cc_library(
         "bluetooth_radio.cc",
         "mediums.cc",
         "uuid.cc",
-        "webrtc.cc",
+        "webrtc_stub.cc",
         "wifi_lan.cc",
     ],
     hdrs = [
@@ -31,9 +31,10 @@ cc_library(
         "lost_entity_tracker.h",
         "mediums.h",
         "uuid.h",
-        "webrtc.h",
+        "webrtc_stub.h",
         "wifi_lan.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections/implementation:__subpackages__",
     ],
@@ -41,9 +42,7 @@ cc_library(
         ":utils",
         "//connections:core_types",
         "//connections/implementation/mediums/ble_v2",
-        "//connections/implementation/mediums/webrtc",
-        "//connections/implementation/mediums/webrtc:data_types",
-        "//connections/implementation/proto:offline_wire_formats_portable_proto",
+        "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/platform:base",
         "//internal/platform:cancellation_flag",
         "//internal/platform:comm",
@@ -56,7 +55,6 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/time",
-        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -69,16 +67,16 @@ cc_library(
     hdrs = [
         "utils.h",
         "webrtc_peer_id.h",
-        "webrtc_socket.h",
+        "webrtc_socket_stub.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections/implementation:__pkg__",
         "//connections/implementation/mediums:__pkg__",
         "//connections/implementation/mediums/webrtc:__pkg__",
     ],
     deps = [
-        "//connections/implementation/mediums/webrtc:data_types",
-        "//connections/implementation/proto:offline_wire_formats_portable_proto",
+        "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/platform:base",
         "//internal/platform:types",
         "@com_google_absl//absl/strings",
@@ -96,6 +94,7 @@ cc_test(
         "uuid_test.cc",
         "wifi_lan_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     shard_count = 16,
     deps = [
         ":mediums",
@@ -105,31 +104,9 @@ cc_test(
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
-    ],
-)
-
-cc_test(
-    name = "core_internal_mediums_webrtc_test",
-    size = "small",
-    srcs = [
-        "webrtc_peer_id_test.cc",
-        "webrtc_test.cc",
-    ],
-    shard_count = 16,
-    tags = [
-        "notsan",  # NOTE(b/139734036): known data race in usrsctplib.
-        "requires-net:external",
-    ],
-    deps = [
-        ":mediums",
-        ":utils",
-        "//internal/platform:base",
-        "//internal/platform:test_util",
-        "//internal/platform:types",
-        "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )

connections/implementation/mediums/ble_v2/BUILD

@@ -41,12 +41,12 @@ cc_library(
         "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:util",
+        "@aappleby_smhasher//:libmurmur3",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
-        "@aappleby_smhasher//:libmurmur3",
     ],
 )
 
@@ -65,7 +65,8 @@ cc_test(
         "//internal/platform:base",
         "//internal/platform:comm",
         "//internal/platform/implementation/g3",  # buildcleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/time",
+        "@com_google_googletest//:gtest_main",
     ],
 )

connections/implementation/mediums/webrtc/BUILD

@@ -39,10 +39,10 @@ cc_library(
         "//internal/platform:logging",
         "//internal/platform:types",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",
+        "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+        "//third_party/webrtc/files/stable/webrtc/pc:peerconnection",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/time",
-        "//webrtc/api:libjingle_peerconnection_api",
-        "//third_party/webrtc/files/stable/webrtc/pc:peerconnection",
     ],
 )
 
@@ -62,7 +62,7 @@ cc_library(
         "//connections:core_types",
         "//internal/platform:base",
         "//internal/platform:types",
-        "//webrtc/api:libjingle_peerconnection_api",
+        "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -87,11 +87,12 @@ cc_test(
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # buildcleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "//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",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/time",
-        "//webrtc/api:libjingle_peerconnection_api",
-        "//webrtc/api:rtc_error",
-        "//webrtc/api:scoped_refptr",
+        "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
     ],
 )

connections/implementation/proto/BUILD

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
-
 licenses(["notice"])
 
 proto_library(
@@ -35,23 +33,6 @@ java_lite_proto_library(
     deps = [":offline_wire_formats_proto"],
 )
 
-portable_proto_library(
-    name = "offline_wire_formats_portable_proto",
-    config = ":offline_wire_formats_proto_config",
-    copts = [
-        "-DGOOGLE_PROTOBUF_NO_RTTI=1",
-    ],
-    header_outs = [
-        "offline_wire_formats.pb.h",
-    ],
-    proto_deps = [
-        ":offline_wire_formats_proto",
-    ],
-    visibility = [
-        "//third_party/nearby:__subpackages__",
-    ],
-)
-
 filegroup(
     name = "offline_wire_formats_proto_config",
     srcs = ["offline_wire_formats_proto_config.asciipb"],

cpp/cal/api/BUILD

@@ -24,9 +24,9 @@ cc_library(
         "//third_party/nearby/cpp:__subpackages__",
     ],
     deps = [
+        "//cpp/cal/base:types",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",
-        "//third_party/nearby/cpp/cal/base:types",
     ],
 )

cpp/cal/public/BUILD

@@ -28,7 +28,7 @@ cc_library(
     ],
     deps = [
         "//third_party/nearby/cpp/cal/api:ble",
-        "//third_party/nearby/cpp/cal/base:types",
+        "//cpp/cal/base:types",
     ],
 )
 
@@ -41,9 +41,10 @@ cc_test(
     ],
     deps = [
         ":ble",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
         "//third_party/nearby/cpp/cal/api:ble",
-        "//third_party/nearby/cpp/cal/base:types",
+        "//cpp/cal/base:types",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )

internal/analytics/BUILD

@@ -35,30 +35,9 @@ cc_library(
         "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/proto/analytics:connections_log_cc_proto",
-        "//proto:connections_enums_portable_proto",
-        "//proto/errorcode:error_code_enums_portable_proto",
+        "//proto:connections_enums_cc_proto",
+        "//proto/errorcode:error_code_enums_cc_proto",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/time",
     ],
 )
-
-cc_test(
-    name = "analytics_test",
-    size = "small",
-    srcs = [
-        "analytics_recorder_test.cc",
-    ],
-    shard_count = 16,
-    deps = [
-        ":analytics",
-        "//internal/platform:comm",
-        "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
-        "//internal/platform:types",
-        "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "//internal/proto/analytics:connections_log_cc_proto",
-        "//proto:connections_enums_portable_proto",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
-        "@com_google_absl//absl/time",
-    ],
-)

internal/platform/BUILD

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-load("//ads/util/non_compile:non_compile.bzl", "cc_with_non_compile_test")
+
 load("//tools/build_defs/cc:cc_fake_binary.bzl", "cc_fake_binary")
 
 licenses(["notice"])
@@ -43,6 +43,7 @@ cc_library(
         "types.h",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//internal/analytics:__subpackages__",
@@ -74,6 +75,7 @@ cc_library(
         "base_pipe.h",
         "byte_utils.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//internal/platform:__pkg__",
@@ -93,6 +95,7 @@ cc_library(
         "logging.h",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
@@ -101,9 +104,9 @@ cc_library(
         "//internal/proto/analytics:__subpackages__",
     ],
     deps = [
-        "@com_google_glog//:glog",
         "//internal/platform/implementation:platform",
         "//internal/platform/implementation:types",
+        "@com_google_glog//:glog",
     ],
 )
 
@@ -116,6 +119,7 @@ cc_library(
         "cancellation_flag.h",
         "cancellation_flag_listener.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections/implementation:__subpackages__",
         "//internal/platform:__pkg__",
@@ -138,6 +142,7 @@ cc_library(
         "error_code_params.h",
         "error_code_recorder.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections/implementation:__subpackages__",
         "//internal/analytics:__subpackages__",
@@ -145,8 +150,8 @@ cc_library(
     ],
     deps = [
         ":logging",
-        "//proto:connections_enums_portable_proto",
-        "//proto/errorcode:error_code_enums_portable_proto",
+        "//proto:connections_enums_cc_proto",
+        "//proto/errorcode:error_code_enums_cc_proto",
     ],
 )
 
@@ -159,6 +164,7 @@ cc_library(
     hdrs = [
         "medium_environment.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//internal/platform:__pkg__",
@@ -182,11 +188,13 @@ cc_test(
         "feature_flags_test.cc",
         "prng_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     deps = [
         ":base",
         ":test_util",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -195,10 +203,12 @@ cc_test(
     srcs = [
         "byte_utils_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     deps = [
         ":base",
         ":util",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -207,12 +217,14 @@ cc_test(
     srcs = [
         "cancellation_flag_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     deps = [
         ":base",
         ":cancellation_flag",
         ":test_util",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -221,22 +233,13 @@ cc_test(
     srcs = [
         "error_code_recorder_test.cc",
     ],
+    defines = ["NO_WEBRTC"],
     deps = [
         ":error_code_recorder",
         ":test_util",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
-    ],
-)
-
-cc_with_non_compile_test(
-    name = "exception_test",
-    srcs = [
-        "exception_test.cc",
-    ],
-    deps = [
-        ":base",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -275,6 +278,7 @@ cc_library(
         "thread_check_callable.h",
         "thread_check_runnable.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//internal/analytics:__subpackages__",
@@ -305,10 +309,10 @@ cc_library(
         "ble.h",
         "bluetooth_adapter.h",
         "bluetooth_classic.h",
-        "webrtc.h",
         "wifi_lan.h",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
@@ -324,7 +328,6 @@ cc_library(
         "//internal/platform/implementation:platform",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/strings",
-        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -352,6 +355,7 @@ cc_test(
         "wifi_lan_test.cc",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
+    defines = ["NO_WEBRTC"],
     shard_count = 16,
     deps = [
         ":comm",
@@ -360,10 +364,11 @@ cc_test(
         "//internal/platform:base",
         "//internal/platform:test_util",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 

internal/platform/implementation/BUILD

@@ -35,6 +35,7 @@ cc_library(
         "submittable_executor.h",
         "system_clock.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//internal/platform:__pkg__",
         "//internal/platform/implementation:__subpackages__",
@@ -55,22 +56,21 @@ cc_library(
         "bluetooth_adapter.h",
         "bluetooth_classic.h",
         "server_sync.h",
-        "webrtc.h",
         "wifi.h",
         "wifi_lan.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections/implementation:__subpackages__",
         "//internal/platform:__pkg__",
         "//internal/platform/implementation:__subpackages__",
     ],
     deps = [
-        "//connections/implementation/proto:offline_wire_formats_portable_proto",
+        "//connections/implementation/proto:offline_wire_formats_cc_proto",
         "//internal/platform:base",
         "//internal/platform:cancellation_flag",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:optional",
-        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -79,6 +79,7 @@ cc_library(
     hdrs = [
         "platform.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
         "//internal/platform:__pkg__",

internal/platform/implementation/g3/BUILD

@@ -32,6 +32,7 @@ cc_library(
         "scheduled_executor.h",
         "single_thread_executor.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = ["//visibility:private"],
     deps = [
         "//base",
@@ -56,16 +57,15 @@ cc_library(
         "ble.cc",
         "bluetooth_adapter.cc",
         "bluetooth_classic.cc",
-        "webrtc.cc",
         "wifi_lan.cc",
     ],
     hdrs = [
         "ble.h",
         "bluetooth_adapter.h",
         "bluetooth_classic.h",
-        "webrtc.h",
         "wifi_lan.h",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = ["//visibility:private"],
     deps = [
         ":types",
@@ -81,9 +81,6 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/synchronization",
-        "//webrtc/api:create_peerconnection_factory",  #buildcleaner: keep
-        "//webrtc/api:libjingle_peerconnection_api",
-        "//webrtc/api/task_queue:default_task_queue_factory",
     ],
 )
 
@@ -93,12 +90,13 @@ cc_library(
     srcs = [
         "crypto.cc",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = ["//visibility:private"],
     deps = [
         "//internal/platform:base",
         "//internal/platform/implementation:types",
-        "@com_google_absl//absl/strings",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -108,6 +106,7 @@ cc_library(
     srcs = [
         "platform.cc",
     ],
+    defines = ["NO_WEBRTC"],
     visibility = [
         "//connections:__subpackages__",
         "//internal/analytics:__subpackages__",

internal/platform/implementation/ios/BUILD

@@ -47,8 +47,8 @@ objc_library(
         "//internal/platform/implementation/ios/Source/Mediums",
         "//internal/platform/implementation/ios/Source/Platform",
         "//internal/platform/implementation/ios/Source/Shared",
-        "@com_google_absl//absl/functional:bind_front",
         "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
+        "@com_google_absl//absl/functional:bind_front",
     ],
 )
 

internal/platform/implementation/ios/Source/Mediums/BUILD

@@ -38,8 +38,8 @@ objc_library(
     deps = [
         ":ObjCProtos",
         "//internal/platform/implementation/ios/Source/Shared",
-        "@com_google_absl//absl/numeric:int128",
         "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
+        "@com_google_absl//absl/numeric:int128",
     ],
 )
 

internal/platform/implementation/ios/Source/Platform/BUILD

@@ -85,9 +85,10 @@ cc_test(
     shard_count = 16,
     deps = [
         ":Platform_cc",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
+        "@com_google_googletest//:gtest_main",
         "@com_google_nisaba//nisaba/port:thread_pool/fiber",
     ],
 )

internal/platform/implementation/shared/BUILD

@@ -80,7 +80,8 @@ cc_test(
         ":file",
         "//file/util:temp_path",
         "//internal/platform:base",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_absl//absl/strings",
+        "@com_google_googletest//:gtest_main",
     ],
 )

internal/platform/implementation/windows/BUILD

@@ -83,8 +83,8 @@ cc_library(
     deps = [
         "//internal/platform:base",
         "//internal/platform/implementation:types",
-        "@com_google_absl//absl/strings",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -166,6 +166,7 @@ cc_test(
         "//internal/platform/implementation:platform",
         "//internal/platform/implementation/windows",
         "//internal/platform/implementation/windows/generated:types",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
     ],
 )

internal/platform/implementation/windows/generated/BUILD

@@ -35,8 +35,8 @@ cc_library(
     ],
     textual_hdrs = glob(["**/*.h"]),
     visibility = [
+        "//location/nearby/cpp/sharing/implementation/internal:__subpackages__",
         "//connections/windows:__subpackages__",
         "//internal/platform/implementation/windows:__subpackages__",
-        "//location/nearby/cpp/sharing/implementation/internal:__subpackages__",
     ],
 )

internal/proto/analytics/BUILD

@@ -54,8 +54,9 @@ cc_test(
         ":connections_log_cc_proto",
         "//internal/platform:logging",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
-        "//net/proto2/public",
-        "//proto:connections_enums_portable_proto",
-        "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers",
+        "//proto:connections_enums_cc_proto",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_protobuf//:protobuf",
     ],
 )

proto/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Proto for Nearby products
-load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
+
 load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
@@ -47,24 +47,6 @@ cc_proto_library(
     ],
 )
 
-portable_proto_library(
-    name = "connections_enums_portable_proto",
-    config = ":connections_enums_proto_config",
-    copts = [
-        "-DGOOGLE_PROTOBUF_NO_RTTI=1",
-    ],
-    header_outs = [
-        "connections_enums.pb.h",
-    ],
-    proto_deps = [
-        ":connections_enums_proto",
-    ],
-    visibility = [
-        "//location/nearby/connections:__subpackages__",
-        "//third_party/nearby:__subpackages__",
-    ],
-)
-
 filegroup(
     name = "connections_enums_proto_config",
     srcs = ["connections_enums_proto_config.asciipb"],

proto/errorcode/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Proto for Nearby products
-load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
+
 load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
@@ -35,20 +35,6 @@ cc_proto_library(
     deps = [":error_code_enums_proto"],
 )
 
-portable_proto_library(
-    name = "error_code_enums_portable_proto",
-    config = ":error_code_enums_proto_config",
-    copts = [
-        "-DGOOGLE_PROTOBUF_NO_RTTI=1",
-    ],
-    proto_deps = [
-        ":error_code_enums_proto",
-    ],
-    visibility = [
-        "//third_party/nearby:__subpackages__",
-    ],
-)
-
 filegroup(
     name = "error_code_enums_proto_config",
     srcs = ["error_code_enums_proto_config.asciipb"],

proto/mediums/BUILD

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
 load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
@@ -96,20 +95,6 @@ cc_proto_library(
     ],
 )
 
-portable_proto_library(
-    name = "ble_frames_portable_proto",
-    config = ":ble_frames_portable_proto_config",
-    copts = [
-        "-DGOOGLE_PROTOBUF_NO_RTTI=1",
-    ],
-    header_outs = [
-        "ble_frames.pb.h",
-    ],
-    proto_deps = [
-        ":ble_frames_proto",
-    ],
-)
-
 filegroup(
     name = "ble_frames_portable_proto_config",
     srcs = ["ble_frames_portable_proto_config.asciipb"],