diff --git a/connections/implementation/proto/BUILD b/connections/implementation/proto/BUILD index 043a1c6b..740e310f 100644 --- a/connections/implementation/proto/BUILD +++ b/connections/implementation/proto/BUILD @@ -21,12 +21,8 @@ proto_library( srcs = [ "offline_wire_formats.proto", ], - cc_api_version = 2, - compatible_with = [ - "//buildenv/target:non_prod", - ], visibility = [ - "//platform/impl/ios:__subpackages__", + "//cpp/platform/impl/ios:__subpackages__", ], ) @@ -41,9 +37,6 @@ java_lite_proto_library( portable_proto_library( name = "offline_wire_formats_portable_proto", - compatible_with = [ - "//buildenv/target:non_prod", - ], config = ":offline_wire_formats_proto_config", copts = [ "-DGOOGLE_PROTOBUF_NO_RTTI=1", @@ -62,7 +55,4 @@ portable_proto_library( filegroup( name = "offline_wire_formats_proto_config", srcs = ["offline_wire_formats_proto_config.asciipb"], - compatible_with = [ - "//buildenv/target:non_prod", - ], ) diff --git a/connections/implementation/proto/offline_wire_formats.proto b/connections/implementation/proto/offline_wire_formats.proto index a86c53d6..e8ecd772 100644 --- a/connections/implementation/proto/offline_wire_formats.proto +++ b/connections/implementation/proto/offline_wire_formats.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package location.nearby.connections; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_outer_classname = "OfflineWireFormatsProto"; option java_package = "com.google.location.nearby.connections.proto"; option objc_class_prefix = "GNCP"; diff --git a/cpp/cal/api/BUILD b/cpp/cal/api/BUILD index aeca0029..f323a974 100644 --- a/cpp/cal/api/BUILD +++ b/cpp/cal/api/BUILD @@ -19,15 +19,14 @@ cc_library( hdrs = [ "ble.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", "//third_party/nearby/cpp:__subpackages__", ], deps = [ - "//absl/strings", - "//absl/time", - "//absl/types:optional", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:optional", "//third_party/nearby/cpp/cal/base:types", ], ) diff --git a/cpp/cal/base/BUILD b/cpp/cal/base/BUILD index cd3220ad..aa030da5 100644 --- a/cpp/cal/base/BUILD +++ b/cpp/cal/base/BUILD @@ -19,12 +19,11 @@ cc_library( hdrs = [ "ble_types.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", "//third_party/nearby/cpp:__subpackages__", ], deps = [ - "//platform/base", + "//cpp/platform/base", ], ) diff --git a/cpp/cal/public/BUILD b/cpp/cal/public/BUILD index cf6c3d62..93a0bbcf 100644 --- a/cpp/cal/public/BUILD +++ b/cpp/cal/public/BUILD @@ -22,7 +22,6 @@ cc_library( hdrs = [ "ble.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", "//third_party/nearby/cpp:__subpackages__", @@ -42,8 +41,8 @@ cc_test( ], deps = [ ":ble", - "//testing/base/public:gunit", - "//testing/base/public:gunit_main", + "@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", ], diff --git a/cpp/core/BUILD b/cpp/core/BUILD index 3da92495..9c5a3477 100644 --- a/cpp/core/BUILD +++ b/cpp/core/BUILD @@ -21,22 +21,21 @@ cc_library( hdrs = [ "core.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//platform/impl/ios:__subpackages__", + "//cpp/platform/impl/ios:__subpackages__", "//third_party/nearby/windows:__subpackages__", ], deps = [ ":core_types", ":event_logger", - "//absl/strings", - "//absl/time", - "//absl/types:span", - "//core/internal", - "//platform/base", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core/internal", + "//cpp/platform/base", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:span", ], ) @@ -63,20 +62,19 @@ cc_library( "status.h", "strategy.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core:__subpackages__", - "//platform/impl/ios:__subpackages__", + "//cpp/core:__subpackages__", + "//cpp/platform/impl/ios:__subpackages__", "//internal/analytics:__subpackages__", ], deps = [ - "//absl/strings", - "//absl/types:variant", - "//platform/base", - "//platform/base:util", - "//platform/public:types", + "//cpp/platform/base", + "//cpp/platform/base:util", + "//cpp/platform/public:types", "//proto:connections_enums_portable_proto", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:variant", ], ) @@ -85,7 +83,6 @@ cc_library( hdrs = [ "event_logger.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//internal/analytics:__subpackages__", ], @@ -108,15 +105,15 @@ cc_test( deps = [ ":core", ":core_types", - "//testing/base/public:gunit_main", - "//absl/strings", - "//absl/time", - "//absl/types:variant", - "//core/internal", - "//core/internal:internal_test", - "//platform/base", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:logging", - "//platform/public:types", + "//cpp/core/internal", + "//cpp/core/internal:internal_test", + "//cpp/platform/base", + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:logging", + "//cpp/platform/public:types", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:variant", ], ) diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD index 1927b1aa..3f81d680 100644 --- a/cpp/core/internal/BUILD +++ b/cpp/core/internal/BUILD @@ -83,39 +83,38 @@ cc_library( "wifi_lan_endpoint_channel.h", "wifi_lan_service_info.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core:__pkg__", - "//core/internal/fuzzers:__pkg__", + "//cpp/core:__pkg__", + "//cpp/core/internal/fuzzers:__pkg__", ], deps = [ ":message_lite", - "//absl/base:core_headers", - "//absl/container:btree", - "//absl/container:flat_hash_map", - "//absl/container:flat_hash_set", - "//absl/functional:bind_front", - "//absl/memory", - "//absl/strings", - "//absl/time", - "//absl/types:span", "//connections/implementation/proto:offline_wire_formats_portable_proto", - "//core:core_types", - "//core/internal/mediums", - "//core/internal/mediums:utils", - "//core/internal/mediums/webrtc", - "//platform/api:comm", - "//platform/base", - "//platform/base:cancellation_flag", - "//platform/base:error_code_recorder", - "//platform/base:util", - "//platform/public:comm", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/core/internal/mediums", + "//cpp/core/internal/mediums:utils", + "//cpp/core/internal/mediums/webrtc", + "//cpp/platform/api:comm", + "//cpp/platform/base", + "//cpp/platform/base:cancellation_flag", + "//cpp/platform/base:error_code_recorder", + "//cpp/platform/base:util", + "//cpp/platform/public:comm", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//internal/analytics", "//proto:connections_enums_portable_proto", - "//securegcm:ukey2", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/container:btree", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/functional:bind_front", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:span", + ":ukey2", ], ) @@ -124,12 +123,11 @@ cc_library( hdrs = [ "message_lite.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core:__subpackages__", + "//cpp/core:__subpackages__", ], deps = [ - "//net/proto2/compat/public:proto2_lite", + "@com_google_protobuf//:protobuf_lite", ], ) @@ -147,17 +145,17 @@ cc_library( "simulation_user.h", ], visibility = [ - "//core:__subpackages__", + "//cpp/core:__subpackages__", ], deps = [ ":internal", - "//testing/base/public:gunit_for_library_testonly", - "//absl/functional:bind_front", - "//absl/strings", - "//core:core_types", - "//platform/base", - "//platform/base:test_util", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/public:types", + "@com_google_googletest//:gtest_for_library_testonly", + "@com_google_absl//absl/functional:bind_front", + "@com_google_absl//absl/strings", ], ) @@ -190,24 +188,24 @@ cc_test( deps = [ ":internal", ":internal_test", - "//testing/base/public:gunit", - "//testing/base/public:gunit_main", - "//absl/container:flat_hash_set", - "//absl/strings", - "//absl/synchronization", - "//absl/time", - "//absl/types:span", "//connections/implementation/proto:offline_wire_formats_portable_proto", - "//core:core_types", - "//core/internal/mediums", - "//core/internal/mediums:utils", - "//platform/base", - "//platform/base:test_util", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:comm", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/core/internal/mediums", + "//cpp/core/internal/mediums:utils", + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:comm", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//proto:connections_enums_portable_proto", - "//securegcm:ukey2", + "@com_google_googletest//:gtest", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//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", ], ) diff --git a/cpp/core/internal/fuzzers/BUILD b/cpp/core/internal/fuzzers/BUILD index f43a02c5..0589ff5b 100644 --- a/cpp/core/internal/fuzzers/BUILD +++ b/cpp/core/internal/fuzzers/BUILD @@ -21,8 +21,8 @@ cc_fuzz_target( componentid = 148515, copts = ["-DCORE_ADAPTER_DLL"], deps = [ + "//cpp/core/internal", + "//cpp/platform/base", "//security/fuzzing/blaze:default_init_google_for_cc_fuzz_target", - "//core/internal", - "//platform/base", ], ) diff --git a/cpp/core/internal/mediums/BUILD b/cpp/core/internal/mediums/BUILD index 6430b3a9..bf5669e3 100644 --- a/cpp/core/internal/mediums/BUILD +++ b/cpp/core/internal/mediums/BUILD @@ -34,29 +34,28 @@ cc_library( "webrtc.h", "wifi_lan.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core/internal:__subpackages__", + "//cpp/core/internal:__subpackages__", ], deps = [ ":utils", - "//absl/container:flat_hash_map", - "//absl/container:flat_hash_set", - "//absl/functional:bind_front", - "//absl/strings", - "//absl/strings:str_format", - "//absl/time", "//connections/implementation/proto:offline_wire_formats_portable_proto", - "//core:core_types", - "//core/internal/mediums/ble_v2", - "//core/internal/mediums/webrtc", - "//core/internal/mediums/webrtc:data_types", - "//platform/base", - "//platform/base:cancellation_flag", - "//platform/public:comm", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/core/internal/mediums/ble_v2", + "//cpp/core/internal/mediums/webrtc", + "//cpp/core/internal/mediums/webrtc:data_types", + "//cpp/platform/base", + "//cpp/platform/base:cancellation_flag", + "//cpp/platform/public:comm", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/functional:bind_front", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/time", "//webrtc/api:libjingle_peerconnection_api", ], ) @@ -72,18 +71,17 @@ cc_library( "webrtc_peer_id.h", "webrtc_socket.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core/internal:__pkg__", - "//core/internal/mediums:__pkg__", - "//core/internal/mediums/webrtc:__pkg__", + "//cpp/core/internal:__pkg__", + "//cpp/core/internal/mediums:__pkg__", + "//cpp/core/internal/mediums/webrtc:__pkg__", ], deps = [ - "//absl/strings", "//connections/implementation/proto:offline_wire_formats_portable_proto", - "//core/internal/mediums/webrtc:data_types", - "//platform/base", - "//platform/public:types", + "//cpp/core/internal/mediums/webrtc:data_types", + "//cpp/platform/base", + "//cpp/platform/public:types", + "@com_google_absl//absl/strings", ], ) @@ -102,14 +100,14 @@ cc_test( deps = [ ":mediums", ":utils", - "//testing/base/public:gunit_main", - "//absl/strings", - "//absl/time", - "//platform/base", - "//platform/base:test_util", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:comm", - "//platform/public:types", + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:comm", + "//cpp/platform/public:types", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", ], ) @@ -128,10 +126,10 @@ cc_test( deps = [ ":mediums", ":utils", - "//testing/base/public:gunit_main", - "//platform/base", - "//platform/base:test_util", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:types", + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:types", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) diff --git a/cpp/core/internal/mediums/ble_v2/BUILD b/cpp/core/internal/mediums/ble_v2/BUILD index d978f802..572ead61 100644 --- a/cpp/core/internal/mediums/ble_v2/BUILD +++ b/cpp/core/internal/mediums/ble_v2/BUILD @@ -31,23 +31,22 @@ cc_library( "bloom_filter.h", "discovered_peripheral_callback.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core/internal:__subpackages__", + "//cpp/core/internal:__subpackages__", ], deps = [ - "//absl/container:flat_hash_map", - "//absl/container:flat_hash_set", - "//absl/numeric:int128", - "//absl/strings", - "//absl/time", - "//core:core_types", - "//platform/base", - "//platform/base:util", - "//platform/public:logging", - "//platform/public:types", - "//smhasher:libmurmur3", + "//cpp/core:core_types", + "//cpp/platform/base", + "//cpp/platform/base:util", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", + "@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", ], ) @@ -63,10 +62,10 @@ cc_test( ], deps = [ ":ble_v2", - "//testing/base/public:gunit_main", - "//absl/time", - "//platform/base", - "//platform/impl/g3", # buildcleaner: keep - "//platform/public:comm", + "//cpp/platform/base", + "//cpp/platform/impl/g3", # buildcleaner: keep + "//cpp/platform/public:comm", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/time", ], ) diff --git a/cpp/core/internal/mediums/webrtc/BUILD b/cpp/core/internal/mediums/webrtc/BUILD index 3a664425..f82b841a 100644 --- a/cpp/core/internal/mediums/webrtc/BUILD +++ b/cpp/core/internal/mediums/webrtc/BUILD @@ -26,22 +26,21 @@ cc_library( "session_description_wrapper.h", "signaling_frames.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core/internal:__subpackages__", + "//cpp/core/internal:__subpackages__", ], deps = [ ":data_types", - "//absl/memory", - "//absl/time", - "//core:core_types", - "//core/internal/mediums:utils", - "//platform/base", - "//platform/public:comm", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/core/internal/mediums:utils", + "//cpp/platform/base", + "//cpp/platform/public:comm", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/time", "//webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/files/stable/webrtc/pc:peerconnection", ], @@ -55,15 +54,14 @@ cc_library( hdrs = [ "webrtc_socket_impl.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core/internal:__subpackages__", + "//cpp/core/internal:__subpackages__", ], deps = [ - "//core:core_types", - "//platform/base", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/platform/base", + "//cpp/platform/public:types", "//webrtc/api:libjingle_peerconnection_api", ], ) @@ -83,17 +81,17 @@ cc_test( deps = [ ":data_types", ":webrtc", - "//net/proto2/compat/public:proto2", - "//testing/base/public:gunit_main", - "//absl/time", - "//core/internal/mediums:utils", - "//platform/base", - "//platform/base:test_util", - "//platform/impl/g3", # buildcleaner: keep - "//platform/public:comm", - "//platform/public:types", + "//cpp/core/internal/mediums:utils", + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/g3", # buildcleaner: keep + "//cpp/platform/public:comm", + "//cpp/platform/public:types", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/time", "//webrtc/api:libjingle_peerconnection_api", "//webrtc/api:rtc_error", "//webrtc/api:scoped_refptr", + "@com_google_protobuf//:protobuf", ], ) diff --git a/cpp/platform/api/BUILD b/cpp/platform/api/BUILD index bd90f0be..a95cab19 100644 --- a/cpp/platform/api/BUILD +++ b/cpp/platform/api/BUILD @@ -35,17 +35,16 @@ cc_library( "submittable_executor.h", "system_clock.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//platform/base:__pkg__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", + "//cpp/platform/base:__pkg__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", ], deps = [ - "//absl/base:core_headers", - "//absl/strings", - "//absl/time", - "//platform/base", + "//cpp/platform/base", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", ], ) @@ -61,19 +60,18 @@ cc_library( "wifi.h", "wifi_lan.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core/internal:__subpackages__", - "//platform/base:__pkg__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", + "//cpp/core/internal:__subpackages__", + "//cpp/platform/base:__pkg__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", ], deps = [ - "//absl/strings", - "//absl/types:optional", "//connections/implementation/proto:offline_wire_formats_portable_proto", - "//platform/base", - "//platform/base:cancellation_flag", + "//cpp/platform/base", + "//cpp/platform/base:cancellation_flag", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", "//webrtc/api:libjingle_peerconnection_api", ], ) @@ -83,17 +81,16 @@ cc_library( hdrs = [ "platform.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ + "//cpp/platform/base:__pkg__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//platform/base:__pkg__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", ], deps = [ ":comm", ":types", - "//absl/strings", - "//platform/base", + "//cpp/platform/base", + "@com_google_absl//absl/strings", ], ) diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD index 15ca8883..b04d7679 100644 --- a/cpp/platform/base/BUILD +++ b/cpp/platform/base/BUILD @@ -41,23 +41,22 @@ cc_library( "socket.h", "types.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//third_party/nearby/cpp/cal:__subpackages__", - "//core:__subpackages__", - "//platform:__subpackages__", - "//platform/api:__subpackages__", + "//cpp/core:__subpackages__", + "//cpp/platform:__subpackages__", + "//cpp/platform/api:__subpackages__", "//internal/analytics:__subpackages__", "//internal/proto/analytics:__subpackages__", + "//third_party/nearby/cpp/cal:__subpackages__", ], deps = [ - "//absl/container:flat_hash_map", - "//absl/meta:type_traits", - "//absl/strings", - "//absl/strings:str_format", - "//absl/synchronization", - "//absl/time", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/meta:type_traits", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", ], ) @@ -74,17 +73,16 @@ cc_library( "base_pipe.h", "byte_utils.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core:__subpackages__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", + "//cpp/core:__subpackages__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", ], deps = [ ":base", - "//absl/base:core_headers", - "//absl/strings:str_format", - "//platform/api:types", + "//cpp/platform/api:types", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/strings:str_format", ], ) @@ -93,15 +91,14 @@ cc_library( hdrs = [ "logging.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ + "//cpp/platform:__subpackages__", "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//platform:__subpackages__", ], deps = [ - "//base:logging", - "//platform/api:platform", - "//platform/api:types", + "@com_google_glog//:glog", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", ], ) @@ -114,18 +111,17 @@ cc_library( "cancellation_flag.h", "cancellation_flag_listener.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core/internal:__subpackages__", - "//platform/api:__subpackages__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", + "//cpp/core/internal:__subpackages__", + "//cpp/platform/api:__subpackages__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", ], deps = [ ":base", ":util", - "//absl/container:flat_hash_set", - "//absl/synchronization", + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/synchronization", ], ) @@ -138,10 +134,9 @@ cc_library( "error_code_params.h", "error_code_recorder.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core/internal:__subpackages__", - "//platform/impl:__subpackages__", + "//cpp/core/internal:__subpackages__", + "//cpp/platform/impl:__subpackages__", "//internal/analytics:__subpackages__", ], deps = [ @@ -161,17 +156,17 @@ cc_library( "medium_environment.h", ], visibility = [ - "//core:__subpackages__", - "//platform/impl:__subpackages__", - "//platform/public:__pkg__", + "//cpp/core:__subpackages__", + "//cpp/platform/impl:__subpackages__", + "//cpp/platform/public:__pkg__", ], deps = [ ":base", ":logging", - "//absl/container:flat_hash_map", - "//absl/strings", - "//platform/api:comm", - "//platform/public:types", + "//cpp/platform/api:comm", + "//cpp/platform/public:types", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/strings", ], ) @@ -186,8 +181,8 @@ cc_test( deps = [ ":base", ":test_util", - "//testing/base/public:gunit_main", - "//platform/impl/g3", # build_cleaner: keep + "//cpp/platform/impl/g3", # build_cleaner: keep + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) @@ -199,7 +194,7 @@ cc_test( deps = [ ":base", ":util", - "//testing/base/public:gunit_main", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) @@ -212,8 +207,8 @@ cc_test( ":base", ":cancellation_flag", ":test_util", - "//testing/base/public:gunit_main", - "//platform/impl/g3", # build_cleaner: keep + "//cpp/platform/impl/g3", # build_cleaner: keep + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) @@ -225,8 +220,8 @@ cc_test( deps = [ ":error_code_recorder", ":test_util", - "//testing/base/public:gunit_main", - "//platform/impl/g3", # build_cleaner: keep + "//cpp/platform/impl/g3", # build_cleaner: keep + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) @@ -237,6 +232,6 @@ cc_with_non_compile_test( ], deps = [ ":base", - "//testing/base/public:gunit_main", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD index 12cce01d..628cf6f1 100644 --- a/cpp/platform/impl/g3/BUILD +++ b/cpp/platform/impl/g3/BUILD @@ -36,16 +36,16 @@ cc_library( deps = [ "//base", "//base:stringprintf", - "//absl/base:core_headers", - "//absl/synchronization", - "//absl/time", - "//platform/api:platform", - "//platform/api:types", - "//platform/base", - "//platform/base:util", - "//platform/impl/shared:count_down_latch", - "//platform/impl/shared:posix_mutex", - "//thread", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "//cpp/platform/base", + "//cpp/platform/base:util", + "//cpp/platform/impl/shared:count_down_latch", + "//cpp/platform/impl/shared:posix_mutex", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", + "@com_google_nisaba//nisaba/port:thread_pool", ], ) @@ -69,18 +69,18 @@ cc_library( visibility = ["//visibility:private"], deps = [ ":types", - "//absl/base:core_headers", - "//absl/container:flat_hash_map", - "//absl/container:flat_hash_set", - "//absl/strings", - "//absl/strings:str_format", - "//absl/synchronization", - "//platform/api:comm", - "//platform/base", - "//platform/base:cancellation_flag", - "//platform/base:logging", - "//platform/base:test_util", - "//platform/impl/shared:count_down_latch", + "//cpp/platform/api:comm", + "//cpp/platform/base", + "//cpp/platform/base:cancellation_flag", + "//cpp/platform/base:logging", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/shared:count_down_latch", + "@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/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", @@ -95,10 +95,10 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - "//absl/strings", - "//platform/api:types", - "//platform/base", - "//openssl:crypto", + "//cpp/platform/api:types", + "//cpp/platform/base", + "@com_google_absl//absl/strings", + "@boringssl//:crypto", ], ) @@ -109,8 +109,8 @@ cc_library( "platform.cc", ], visibility = [ - "//core:__subpackages__", - "//platform:__subpackages__", + "//cpp/core:__subpackages__", + "//cpp/platform:__subpackages__", "//internal/analytics:__subpackages__", "//internal/proto/analytics:__subpackages__", ], @@ -118,15 +118,15 @@ cc_library( ":comm", ":crypto", # build_cleaner: keep ":types", - "//absl/base:core_headers", - "//absl/memory", - "//absl/strings", - "//absl/time", - "//platform/api:comm", - "//platform/api:platform", - "//platform/api:types", - "//platform/base:test_util", - "//platform/impl/shared:count_down_latch", - "//platform/impl/shared:file", + "//cpp/platform/api:comm", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/shared:count_down_latch", + "//cpp/platform/impl/shared:file", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", ], ) diff --git a/cpp/platform/impl/ios/BUILD b/cpp/platform/impl/ios/BUILD index 34d87551..1c3c39bc 100644 --- a/cpp/platform/impl/ios/BUILD +++ b/cpp/platform/impl/ios/BUILD @@ -42,12 +42,12 @@ objc_library( "Source/Internal/GNCUtils.h", ], deps = [ - "//absl/functional:bind_front", - "//core", - "//core:core_types", - "//platform/impl/ios/Source/Mediums", - "//platform/impl/ios/Source/Platform", - "//platform/impl/ios/Source/Shared", + "//cpp/core", + "//cpp/core:core_types", + "//cpp/platform/impl/ios/Source/Mediums", + "//cpp/platform/impl/ios/Source/Platform", + "//cpp/platform/impl/ios/Source/Shared", + "@com_google_absl//absl/functional:bind_front", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ], ) diff --git a/cpp/platform/impl/ios/Source/Mediums/BUILD b/cpp/platform/impl/ios/Source/Mediums/BUILD index 964cff52..ea71d6b3 100644 --- a/cpp/platform/impl/ios/Source/Mediums/BUILD +++ b/cpp/platform/impl/ios/Source/Mediums/BUILD @@ -15,7 +15,7 @@ load("//tools/build_defs/apple:objc.bzl", "objc_proto_library") # limitations under the License. licenses(["notice"]) -package(default_visibility = ["//platform/impl/ios:__subpackages__"]) +package(default_visibility = ["//cpp/platform/impl/ios:__subpackages__"]) objc_library( name = "Mediums", @@ -37,8 +37,8 @@ objc_library( ], deps = [ ":ObjCProtos", - "//absl/numeric:int128", - "//platform/impl/ios/Source/Shared", + "//cpp/platform/impl/ios/Source/Shared", + "@com_google_absl//absl/numeric:int128", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ], ) diff --git a/cpp/platform/impl/ios/Source/Platform/BUILD b/cpp/platform/impl/ios/Source/Platform/BUILD index 44886f36..79e07f0c 100644 --- a/cpp/platform/impl/ios/Source/Platform/BUILD +++ b/cpp/platform/impl/ios/Source/Platform/BUILD @@ -13,7 +13,7 @@ # limitations under the License. licenses(["notice"]) -package(default_visibility = ["//platform/impl/ios:__subpackages__"]) +package(default_visibility = ["//cpp/platform/impl/ios:__subpackages__"]) objc_library( name = "Platform", @@ -41,11 +41,11 @@ objc_library( ], deps = [ ":Platform_cc", - "//platform/api:platform", - "//platform/api:types", - "//platform/impl/ios/Source/Mediums", - "//platform/impl/ios/Source/Shared", - "//platform/impl/shared:file", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "//cpp/platform/impl/ios/Source/Mediums", + "//cpp/platform/impl/ios/Source/Shared", + "//cpp/platform/impl/shared:file", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ], ) @@ -65,11 +65,11 @@ cc_library( "mutex.h", ], deps = [ - "//absl/strings:str_format", - "//absl/synchronization", - "//absl/time", - "//platform/api:platform", - "//platform/api:types", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", ], ) @@ -85,9 +85,9 @@ cc_test( shard_count = 16, deps = [ ":Platform_cc", - "//testing/base/public:gunit_main", - "//absl/synchronization", - "//absl/time", - "//thread/fiber", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", + "@com_google_nisaba//nisaba/port:thread_pool/fiber", ], ) diff --git a/cpp/platform/impl/ios/Source/Shared/BUILD b/cpp/platform/impl/ios/Source/Shared/BUILD index a4ac1dcf..66b36f03 100644 --- a/cpp/platform/impl/ios/Source/Shared/BUILD +++ b/cpp/platform/impl/ios/Source/Shared/BUILD @@ -13,7 +13,7 @@ # limitations under the License. licenses(["notice"]) -package(default_visibility = ["//platform/impl/ios:__subpackages__"]) +package(default_visibility = ["//cpp/platform/impl/ios:__subpackages__"]) objc_library( name = "Shared", @@ -25,6 +25,6 @@ objc_library( ], deps = [ "//third_party/objective_c/google_toolbox_for_mac:GTM_StringEncoding", - "//smhasher:libmurmur3", + "@aappleby_smhasher//:libmurmur3", ], ) diff --git a/cpp/platform/impl/ios/Tests/BUILD b/cpp/platform/impl/ios/Tests/BUILD index c0f032ed..c13c6924 100644 --- a/cpp/platform/impl/ios/Tests/BUILD +++ b/cpp/platform/impl/ios/Tests/BUILD @@ -28,7 +28,7 @@ objc_library( "Platform/GNCSingleThreadExecutorTest.mm", ], deps = [ - "//platform/impl/ios:Connections", + "//cpp/platform/impl/ios:Connections", ], ) @@ -48,8 +48,8 @@ objc_library( "Shared/GNCUtilsTest.mm", ], deps = [ - "//platform/impl/ios/Source/Platform", - "//platform/impl/ios/Source/Shared", + "//cpp/platform/impl/ios/Source/Platform", + "//cpp/platform/impl/ios/Source/Shared", ], ) diff --git a/cpp/platform/impl/shared/BUILD b/cpp/platform/impl/shared/BUILD index ffb820e3..7d012c64 100644 --- a/cpp/platform/impl/shared/BUILD +++ b/cpp/platform/impl/shared/BUILD @@ -21,11 +21,10 @@ cc_library( hdrs = [ "posix_mutex.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//platform/impl:__subpackages__", + "//cpp/platform/impl:__subpackages__", ], - deps = ["//platform/api:types"], + deps = ["//cpp/platform/api:types"], ) cc_library( @@ -36,10 +35,9 @@ cc_library( hdrs = [ "posix_condition_variable.h", ], - compatible_with = ["//buildenv/target:non_prod"], deps = [ ":posix_mutex", - "//platform/api:types", + "//cpp/platform/api:types", ], ) @@ -47,14 +45,13 @@ cc_library( name = "file", srcs = ["file.cc"], hdrs = ["file.h"], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//platform/impl:__subpackages__", + "//cpp/platform/impl:__subpackages__", ], deps = [ - "//absl/strings", - "//platform/api:types", - "//platform/base", + "//cpp/platform/api:types", + "//cpp/platform/base", + "@com_google_absl//absl/strings", ], ) @@ -62,17 +59,16 @@ cc_library( name = "count_down_latch", srcs = ["count_down_latch.cc"], hdrs = ["count_down_latch.h"], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ + "//cpp/platform/impl:__subpackages__", "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//platform/impl:__subpackages__", ], deps = [ - "//absl/base:core_headers", - "//absl/strings", - "//absl/synchronization", - "//absl/time", - "//platform/api:types", + "//cpp/platform/api:types", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", ], ) @@ -81,9 +77,9 @@ cc_test( srcs = ["file_test.cc"], deps = [ ":file", + "//cpp/platform/base", "//file/util:temp_path", - "//testing/base/public:gunit_main", - "//absl/strings", - "//platform/base", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/strings", ], ) diff --git a/cpp/platform/impl/windows/BUILD b/cpp/platform/impl/windows/BUILD index 9458ac86..b4ff01e1 100644 --- a/cpp/platform/impl/windows/BUILD +++ b/cpp/platform/impl/windows/BUILD @@ -36,12 +36,11 @@ cc_library( "submittable_executor.h", "utils.h", ], - compatible_with = ["//buildenv/target:non_prod"], deps = [ "//base", "//base:stringprintf", - "//platform/api:types", - "//platform/base", + "//cpp/platform/api:types", + "//cpp/platform/base", ], ) @@ -67,12 +66,11 @@ cc_library( "wifi.h", "wifi_lan.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = ["//visibility:private"], deps = [ - "//platform/api:comm", - "//platform/base", - "//platform/impl/windows/generated:types", + "//cpp/platform/api:comm", + "//cpp/platform/base", + "//cpp/platform/impl/windows/generated:types", ], ) @@ -81,13 +79,12 @@ cc_library( srcs = [ "crypto.cc", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = ["//visibility:private"], deps = [ - "//absl/strings", - "//platform/api:types", - "//platform/base", - "//openssl:crypto", + "//cpp/platform/api:types", + "//cpp/platform/base", + "@com_google_absl//absl/strings", + "@boringssl//:crypto", ], ) @@ -110,7 +107,6 @@ cc_library( "wifi_lan_server_socket.cc", "wifi_lan_socket.cc", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-Ithird_party/nearby/cpp/platform/impl/windows/generated"], defines = ["_SILENCE_CLANG_COROUTINE_MESSAGE"], visibility = [ @@ -120,13 +116,13 @@ cc_library( ":comm", ":crypto", # build_cleaner: keep ":types", - "//platform/api:comm", - "//platform/api:platform", - "//platform/api:types", - "//platform/impl/shared:count_down_latch", - "//platform/impl/shared:file", - "//platform/impl/windows/generated:types", - "//platform/public:types", + "//cpp/platform/api:comm", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "//cpp/platform/impl/shared:count_down_latch", + "//cpp/platform/impl/shared:file", + "//cpp/platform/impl/windows/generated:types", + "//cpp/platform/public:types", ], ) @@ -143,7 +139,7 @@ cc_library( "//third_party/nearby/windows:__subpackages__", ], deps = [ - "//platform/base", + "//cpp/platform/base", ], ) @@ -165,11 +161,11 @@ cc_test( ":crypto", ":test_utils", ":types", - "//testing/base/public:gunit_main", - "//platform/api:platform", - "//platform/base", - "//platform/impl/windows", - "//platform/impl/windows/generated:types", - "//platform/public:logging", + "//cpp/platform/api:platform", + "//cpp/platform/base", + "//cpp/platform/impl/windows", + "//cpp/platform/impl/windows/generated:types", + "//cpp/platform/public:logging", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) diff --git a/cpp/platform/impl/windows/generated/BUILD b/cpp/platform/impl/windows/generated/BUILD index c3c5a2b7..353ec2ce 100644 --- a/cpp/platform/impl/windows/generated/BUILD +++ b/cpp/platform/impl/windows/generated/BUILD @@ -15,7 +15,6 @@ licenses(["notice"]) cc_library( name = "types", - compatible_with = ["//buildenv/target:non_prod"], linkopts = [ "advapi32.lib", "comdlg32.lib", @@ -36,7 +35,7 @@ cc_library( ], textual_hdrs = glob(["**/*.h"]), visibility = [ + "//cpp/platform/impl/windows:__subpackages__", "//third_party/nearby/connections/windows:__subpackages__", - "//platform/impl/windows:__subpackages__", ], ) diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD index 402b84b4..a893e253 100644 --- a/cpp/platform/public/BUILD +++ b/cpp/platform/public/BUILD @@ -50,24 +50,23 @@ cc_library( "thread_check_callable.h", "thread_check_runnable.h", ], - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core:__subpackages__", - "//platform/base:__pkg__", - "//platform/impl/ios:__subpackages__", - "//platform/impl/windows:__subpackages__", - "//platform/public:__pkg__", + "//cpp/core:__subpackages__", + "//cpp/platform/base:__pkg__", + "//cpp/platform/impl/ios:__subpackages__", + "//cpp/platform/impl/windows:__subpackages__", + "//cpp/platform/public:__pkg__", "//internal/analytics:__subpackages__", ], deps = [ ":logging", - "//absl/base:core_headers", - "//absl/time", - "//platform/api:platform", - "//platform/api:types", - "//platform/base", - "//platform/base:logging", - "//platform/base:util", + "//cpp/platform/api:platform", + "//cpp/platform/api:types", + "//cpp/platform/base", + "//cpp/platform/base:logging", + "//cpp/platform/base:util", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/time", ], ) @@ -86,23 +85,22 @@ cc_library( "webrtc.h", "wifi_lan.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ + "//cpp/core:__subpackages__", + "//cpp/platform/public:__pkg__", "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//core:__subpackages__", - "//platform/public:__pkg__", "//internal/analytics:__subpackages__", ], deps = [ ":logging", ":types", - "//absl/container:flat_hash_map", - "//absl/strings", - "//platform/api:comm", - "//platform/api:platform", - "//platform/base", - "//platform/base:cancellation_flag", + "//cpp/platform/api:comm", + "//cpp/platform/api:platform", + "//cpp/platform/base", + "//cpp/platform/base:cancellation_flag", + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/strings", "//webrtc/api:libjingle_peerconnection_api", ], ) @@ -112,16 +110,15 @@ cc_library( hdrs = [ "logging.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core:__subpackages__", - "//platform:__subpackages__", + "//cpp/core:__subpackages__", + "//cpp/platform:__subpackages__", "//internal/analytics:__subpackages__", "//internal/proto/analytics:__subpackages__", ], deps = [ - "//platform/base:logging", + "//cpp/platform/base:logging", ], ) @@ -154,13 +151,13 @@ cc_test( ":comm", ":logging", ":types", - "//testing/base/public:gunit_main", - "//absl/strings", - "//absl/synchronization", - "//absl/time", - "//platform/base", - "//platform/base:test_util", - "//platform/impl/g3", # build_cleaner: keep + "//cpp/platform/base", + "//cpp/platform/base:test_util", + "//cpp/platform/impl/g3", # build_cleaner: keep + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", ], ) @@ -169,7 +166,7 @@ cc_fake_binary( srcs = ["thread_check_nocompile.cc"], deps = [ ":types", - "//absl/time", + "@com_google_absl//absl/time", ], ) diff --git a/internal/analytics/BUILD b/internal/analytics/BUILD index 76b249e0..b98fab18 100644 --- a/internal/analytics/BUILD +++ b/internal/analytics/BUILD @@ -22,24 +22,23 @@ cc_library( "analytics_recorder.h", "connection_attempt_metadata_params.h", ], - compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//core:__subpackages__", + "//cpp/core:__subpackages__", "//internal/proto/analytics:__subpackages__", ], deps = [ - "//absl/container:btree", - "//absl/time", - "//core:core_types", - "//core:event_logger", - "//platform/base", - "//platform/base:error_code_recorder", - "//platform/public:logging", - "//platform/public:types", + "//cpp/core:core_types", + "//cpp/core:event_logger", + "//cpp/platform/base", + "//cpp/platform/base:error_code_recorder", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//internal/proto/analytics:connections_log_cc_proto", "//proto:connections_enums_portable_proto", "//proto/errorcode:error_code_enums_portable_proto", + "@com_google_absl//absl/container:btree", + "@com_google_absl//absl/time", ], ) @@ -52,14 +51,14 @@ cc_test( shard_count = 16, deps = [ ":analytics", - "//testing/base/public:gunit_main", - "//absl/time", - "//platform/base:error_code_recorder", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:comm", - "//platform/public:logging", - "//platform/public:types", + "//cpp/platform/base:error_code_recorder", + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:comm", + "//cpp/platform/public:logging", + "//cpp/platform/public:types", "//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", ], ) diff --git a/internal/proto/analytics/BUILD b/internal/proto/analytics/BUILD index fcb8e7e6..3c9b4863 100644 --- a/internal/proto/analytics/BUILD +++ b/internal/proto/analytics/BUILD @@ -23,10 +23,7 @@ proto_library( srcs = [ "connections_log.proto", ], - cc_api_version = 2, - compatible_with = ["//buildenv/target:non_prod"], deps = [ - "//proto:connections_enums_proto", "//proto/errorcode:error_code_enums_proto", ], @@ -34,9 +31,8 @@ proto_library( cc_proto_library( name = "connections_log_cc_proto", - compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//core:__subpackages__", + "//cpp/core:__subpackages__", "//internal/analytics:__subpackages__", ], deps = [":connections_log_proto"], @@ -56,11 +52,10 @@ cc_test( shard_count = 16, deps = [ ":connections_log_cc_proto", - + "//cpp/platform/impl/g3", # build_cleaner: keep + "//cpp/platform/public:logging", "//net/proto2/public", - "//testing/base/public:gunit_main", - "//platform/impl/g3", # build_cleaner: keep - "//platform/public:logging", "//proto:connections_enums_portable_proto", + "@com_google_googletest//:gtest_main","@com_github_protobuf_matchers//protobuf-matchers:protobuf-matchers", ], ) diff --git a/internal/proto/analytics/connections_log.proto b/internal/proto/analytics/connections_log.proto index e2d48921..568b3d1d 100644 --- a/internal/proto/analytics/connections_log.proto +++ b/internal/proto/analytics/connections_log.proto @@ -20,7 +20,7 @@ package location.nearby.analytics.proto; import "proto/connections_enums.proto"; import "proto/errorcode/error_code_enums.proto"; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_package = "com.google.location.nearby.analytics.proto"; option java_outer_classname = "ConnectionsLogProto"; option objc_class_prefix = "GNCP"; diff --git a/proto/BUILD b/proto/BUILD index 788bf324..9d3452ff 100644 --- a/proto/BUILD +++ b/proto/BUILD @@ -23,11 +23,6 @@ package(default_visibility = ["//visibility:public"]) proto_library( name = "connections_enums_proto", srcs = ["connections_enums.proto"], - cc_api_version = 2, - compatible_with = ["//buildenv/target:non_prod"], - deps = [ - "//logs/proto/logs_annotations", - ], ) java_lite_proto_library( @@ -54,9 +49,6 @@ cc_proto_library( portable_proto_library( name = "connections_enums_portable_proto", - compatible_with = [ - "//buildenv/target:non_prod", - ], config = ":connections_enums_proto_config", copts = [ "-DGOOGLE_PROTOBUF_NO_RTTI=1", @@ -76,19 +68,11 @@ portable_proto_library( filegroup( name = "connections_enums_proto_config", srcs = ["connections_enums_proto_config.asciipb"], - compatible_with = [ - "//buildenv/target:non_prod", - ], ) proto_library( name = "sharing_enums_proto", srcs = ["sharing_enums.proto"], - cc_api_version = 2, - compatible_with = ["//buildenv/target:non_prod"], - deps = [ - "//logs/proto/logs_annotations", - ], ) java_lite_proto_library( diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto index 9384440f..cdf6e61a 100644 --- a/proto/connections_enums.proto +++ b/proto/connections_enums.proto @@ -19,7 +19,7 @@ package location.nearby.proto.connections; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "ConnectionsEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/errorcode/BUILD b/proto/errorcode/BUILD index b6734ec7..39502c58 100644 --- a/proto/errorcode/BUILD +++ b/proto/errorcode/BUILD @@ -23,11 +23,6 @@ package(default_visibility = ["//visibility:public"]) proto_library( name = "error_code_enums_proto", srcs = ["error_code_enums.proto"], - cc_api_version = 2, - compatible_with = ["//buildenv/target:non_prod"], - deps = [ - "//logs/proto/logs_annotations", - ], ) java_lite_proto_library( @@ -42,9 +37,6 @@ cc_proto_library( portable_proto_library( name = "error_code_enums_portable_proto", - compatible_with = [ - "//buildenv/target:non_prod", - ], config = ":error_code_enums_proto_config", copts = [ "-DGOOGLE_PROTOBUF_NO_RTTI=1", @@ -60,7 +52,4 @@ portable_proto_library( filegroup( name = "error_code_enums_proto_config", srcs = ["error_code_enums_proto_config.asciipb"], - compatible_with = [ - "//buildenv/target:non_prod", - ], ) diff --git a/proto/errorcode/error_code_enums.proto b/proto/errorcode/error_code_enums.proto index a2e07b1b..44f4c85f 100644 --- a/proto/errorcode/error_code_enums.proto +++ b/proto/errorcode/error_code_enums.proto @@ -19,7 +19,7 @@ package location.nearby.errorcode.proto; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_package = "com.google.location.nearby.errorcode.proto"; option java_outer_classname = "ErrorCodeEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/mediums/BUILD b/proto/mediums/BUILD index 63304169..4ca20204 100644 --- a/proto/mediums/BUILD +++ b/proto/mediums/BUILD @@ -24,7 +24,6 @@ proto_library( srcs = [ "nfc_frames.proto", ], - cc_api_version = 2, ) java_lite_proto_library( @@ -38,7 +37,6 @@ proto_library( srcs = [ "wifi_aware_frames.proto", ], - cc_api_version = 2, ) java_lite_proto_library( @@ -55,17 +53,10 @@ proto_library( srcs = [ "web_rtc_signaling_frames.proto", ], - cc_api_version = 2, - compatible_with = [ - "//buildenv/target:non_prod", - ], ) cc_proto_library( name = "web_rtc_signaling_frames_cc_proto", - compatible_with = [ - "//buildenv/target:non_prod", - ], visibility = [ "//location/nearby/connections:__subpackages__", "//third_party/nearby:__subpackages__", @@ -87,7 +78,6 @@ proto_library( srcs = [ "ble_frames.proto", ], - cc_api_version = 2, ) java_lite_proto_library( diff --git a/proto/mediums/ble_frames.proto b/proto/mediums/ble_frames.proto index d2c9d8af..65f266fc 100644 --- a/proto/mediums/ble_frames.proto +++ b/proto/mediums/ble_frames.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package location.nearby.mediums; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_outer_classname = "BleFramesProto"; option java_package = "com.google.location.nearby.mediums.proto"; option objc_class_prefix = "GNCM"; diff --git a/proto/mediums/nfc_frames.proto b/proto/mediums/nfc_frames.proto index 8dcf0183..0c9c1b8c 100644 --- a/proto/mediums/nfc_frames.proto +++ b/proto/mediums/nfc_frames.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package location.nearby.mediums; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_outer_classname = "NfcFramesProto"; option java_package = "com.google.location.nearby.mediums.proto"; diff --git a/proto/mediums/web_rtc_signaling_frames.proto b/proto/mediums/web_rtc_signaling_frames.proto index 58f8385f..afc94a8f 100644 --- a/proto/mediums/web_rtc_signaling_frames.proto +++ b/proto/mediums/web_rtc_signaling_frames.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package location.nearby.mediums; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_outer_classname = "WebRtcSignalingFramesProto"; option java_package = "com.google.location.nearby.mediums.proto"; diff --git a/proto/mediums/wifi_aware_frames.proto b/proto/mediums/wifi_aware_frames.proto index f4b71235..69b0aee5 100644 --- a/proto/mediums/wifi_aware_frames.proto +++ b/proto/mediums/wifi_aware_frames.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package location.nearby.mediums; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_outer_classname = "WifiAwareFramesProto"; option java_package = "com.google.location.nearby.mediums.proto"; diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto index ff9bfb05..e7d04280 100644 --- a/proto/sharing_enums.proto +++ b/proto/sharing_enums.proto @@ -19,7 +19,7 @@ package location.nearby.proto.sharing; -option optimize_for = LITE_RUNTIME; +option optimize_for = SPEED; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "SharingEnums"; option objc_class_prefix = "GNSHP"; diff --git a/windows/BUILD b/windows/BUILD index d3d0bda3..4b2cbd13 100644 --- a/windows/BUILD +++ b/windows/BUILD @@ -28,10 +28,10 @@ cc_windows_dll( defines = ["CORE_ADAPTER_DLL"], tags = ["windows-dll"], deps = [ - "//absl/strings", + "//cpp/core", + "//cpp/platform/impl/windows", + "@com_google_absl//absl/strings", "//third_party/dart_lang/v2:dart_api_dl", - "//core", - "//platform/impl/windows", "//webrtc/api:create_peerconnection_factory", ], ) @@ -52,10 +52,10 @@ cc_windows_dll( defines = ["CORE_ADAPTER_DART_DLL"], tags = ["windows-dll"], deps = [ - "//absl/strings", + "//cpp/core", + "//cpp/platform/impl/windows", + "@com_google_absl//absl/strings", "//third_party/dart_lang/v2:dart_api_dl", - "//core", - "//platform/impl/windows", "//webrtc/api:create_peerconnection_factory", ], )