diff --git a/fastpair/server_access/BUILD b/fastpair/server_access/BUILD index 8c22188a..7036aac8 100644 --- a/fastpair/server_access/BUILD +++ b/fastpair/server_access/BUILD @@ -36,6 +36,7 @@ cc_library( "//internal/auth:types", "//internal/base", "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//internal/platform/implementation:types", "@com_google_absl//absl/status", @@ -91,13 +92,12 @@ cc_test( "//fastpair/common", "//fastpair/proto:fastpair_cc_proto", "//fastpair/proto:proto_builder", - "//internal/account", "//internal/auth:credential", "//internal/auth:types", "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/preferences", "//internal/test", "//internal/test/google3_only:test", "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/internal/network/BUILD b/internal/network/BUILD index 0620b329..778d4b37 100644 --- a/internal/network/BUILD +++ b/internal/network/BUILD @@ -1,21 +1,12 @@ licenses(["notice"]) cc_library( - name = "types", + name = "url", srcs = [ - "http_request.cc", - "http_response.cc", - "http_status_code.cc", "url.cc", "utils.cc", ], hdrs = [ - "http_body.h", - "http_client.h", - "http_client_factory.h", - "http_request.h", - "http_response.h", - "http_status_code.h", "url.h", "utils.h", ], @@ -27,6 +18,36 @@ cc_library( "//sharing:__subpackages__", ], deps = [ + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", + "@com_google_absl//absl/strings", + ], +) + +cc_library( + name = "types", + srcs = [ + "http_request.cc", + "http_response.cc", + "http_status_code.cc", + ], + hdrs = [ + "http_body.h", + "http_client.h", + "http_client_factory.h", + "http_request.h", + "http_response.h", + "http_status_code.h", + ], + visibility = [ + "//fastpair:__subpackages__", + "//internal:__pkg__", + "//internal:__subpackages__", + "//location/nearby/cpp/sharing:__subpackages__", + "//sharing:__subpackages__", + ], + deps = [ + ":url", "//internal/platform:types", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", @@ -83,9 +104,10 @@ cc_test( deps = [ ":nearby_http_client", ":types", + ":url", "//internal/platform/implementation:comm", "//internal/platform/implementation:platform", - "//internal/platform/implementation/g3", + "//internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status", diff --git a/internal/test/BUILD b/internal/test/BUILD index 1bb96584..4636d49b 100644 --- a/internal/test/BUILD +++ b/internal/test/BUILD @@ -75,6 +75,7 @@ cc_test( deps = [ ":test", "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//internal/platform/implementation:types", "//internal/platform/implementation/g3", # fixdeps: keep diff --git a/sharing/BUILD b/sharing/BUILD index bce8c05c..2d471fc4 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -45,7 +45,7 @@ cc_library( deps = [ "//internal/crypto_cros", "//internal/interop:authentication_status", - "//internal/network:types", + "//internal/network:url", "//sharing/common:compatible_u8_string", "//sharing/common:enum", "//sharing/internal/base", @@ -136,7 +136,7 @@ cc_library( "//internal/base", "//internal/base:bluetooth_address", "//internal/flags:nearby_flags", - "//internal/network:types", + "//internal/network:url", "//internal/platform:base", "//internal/platform:types", "//internal/platform/implementation:types", @@ -250,6 +250,7 @@ cc_test( "//internal/analytics:event_logger", "//internal/flags:nearby_flags", "//internal/network:types", + "//internal/network:url", "//internal/platform/implementation:types", "//internal/platform/implementation/g3", # fixdeps: keep "//internal/test", diff --git a/sharing/internal/public/BUILD b/sharing/internal/public/BUILD index 24cc9c1c..1dc3ee28 100644 --- a/sharing/internal/public/BUILD +++ b/sharing/internal/public/BUILD @@ -22,7 +22,7 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//sharing/internal/api:platform", "@com_google_absl//absl/status", @@ -44,7 +44,7 @@ cc_library( deps = [ ":logging", ":types", - "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//sharing/internal/api:platform", "@com_google_absl//absl/container:flat_hash_map", diff --git a/sharing/internal/test/BUILD b/sharing/internal/test/BUILD index e9a89663..536d5827 100644 --- a/sharing/internal/test/BUILD +++ b/sharing/internal/test/BUILD @@ -39,7 +39,7 @@ cc_library( deps = [ "//internal/base", "//internal/base:bluetooth_address", - "//internal/network:types", + "//internal/network:url", "//internal/platform:types", "//internal/test", "//sharing/internal/api:platform",