reviewer comments

bazel/grpc_build_system.bzl

@@ -27,13 +27,13 @@
 Contains macros used throughout the repo.
 """
 
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
-load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
-load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
 load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS")
 load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES", "TEST_EXPERIMENT_POLLERS")
+load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
+load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
+load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 
 # The set of pollers to test against if a test exercises polling
 POLLERS = ["epoll1", "poll"]
@@ -120,7 +120,7 @@ def _update_visibility(visibility):
         "tsi": PRIVATE,
         "xds": PRIVATE,
         "xds_client_core": PRIVATE,
-        "xds_end2end_test_lib": PRIVATE,
+        "xds_end2end_test_utils": PRIVATE,
         "grpc_python_observability": PRIVATE,
         "event_engine_base_hdrs": PRIVATE,
         "useful": PRIVATE,

test/cpp/end2end/xds/BUILD

@@ -25,7 +25,7 @@ grpc_cc_library(
     name = "xds_server",
     srcs = ["xds_server.cc"],
     hdrs = ["xds_server.h"],
-    visibility = ["@grpc:xds_end2end_test_lib"],
+    visibility = ["@grpc:xds_end2end_test_utils"],
     deps = [
         "//:gpr",
         "//:grpc",
@@ -46,7 +46,7 @@ grpc_cc_library(
     name = "xds_utils",
     srcs = ["xds_utils.cc"],
     hdrs = ["xds_utils.h"],
-    visibility = ["@grpc:xds_end2end_test_lib"],
+    visibility = ["@grpc:xds_end2end_test_utils"],
     deps = [
         ":xds_server",
         "//src/proto/grpc/testing/xds/v3:cluster_proto",