Merge pull request #25045 from veblush/examples-build

Refactor examples BUILD files

examples/BUILD

@@ -1,252 +0,0 @@
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-licenses(["notice"])  # 3-clause BSD
-
-package(default_visibility = ["//visibility:public"])
-
-load("@grpc_python_dependencies//:requirements.bzl", "requirement")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-load("//bazel:grpc_build_system.bzl", "grpc_proto_library")
-load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
-
-grpc_proto_library(
-    name = "auth_sample",
-    srcs = ["protos/auth_sample.proto"],
-)
-
-grpc_proto_library(
-    name = "hellostreamingworld",
-    srcs = ["protos/hellostreamingworld.proto"],
-)
-
-# The following three rules demonstrate the usage of the cc_grpc_library rule in
-# in a mode compatible with the native proto_library and cc_proto_library rules.
-proto_library(
-    name = "helloworld_proto",
-    srcs = ["protos/helloworld.proto"],
-)
-
-cc_proto_library(
-    name = "helloworld_cc_proto",
-    deps = [":helloworld_proto"],
-)
-
-cc_grpc_library(
-    name = "helloworld_cc_grpc",
-    srcs = [":helloworld_proto"],
-    grpc_only = True,
-    deps = [":helloworld_cc_proto"],
-)
-
-grpc_proto_library(
-    name = "route_guide",
-    srcs = ["protos/route_guide.proto"],
-)
-
-proto_library(
-    name = "keyvaluestore_proto",
-    srcs = ["protos/keyvaluestore.proto"],
-)
-
-grpc_proto_library(
-    name = "keyvaluestore",
-    srcs = ["protos/keyvaluestore.proto"],
-)
-
-proto_library(
-    name = "protos/helloworld_proto",
-    srcs = ["protos/helloworld.proto"],
-)
-
-py_proto_library(
-    name = "helloworld_py_pb2",
-    deps = [":protos/helloworld_proto"],
-)
-
-py_grpc_library(
-    name = "helloworld_py_pb2_grpc",
-    srcs = [":protos/helloworld_proto"],
-    deps = [":helloworld_py_pb2"],
-)
-
-cc_binary(
-    name = "greeter_client",
-    srcs = ["cpp/helloworld/greeter_client.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "greeter_async_client",
-    srcs = ["cpp/helloworld/greeter_async_client.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "greeter_async_client2",
-    srcs = ["cpp/helloworld/greeter_async_client2.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "greeter_server",
-    srcs = ["cpp/helloworld/greeter_server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-        "//:grpc++_reflection",
-    ],
-)
-
-cc_binary(
-    name = "greeter_async_server",
-    srcs = ["cpp/helloworld/greeter_async_server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "metadata_client",
-    srcs = ["cpp/metadata/greeter_client.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "metadata_server",
-    srcs = ["cpp/metadata/greeter_server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "lb_client",
-    srcs = ["cpp/load_balancing/greeter_client.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "lb_server",
-    srcs = ["cpp/load_balancing/greeter_server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "compression_client",
-    srcs = ["cpp/compression/greeter_client.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "compression_server",
-    srcs = ["cpp/compression/greeter_server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":helloworld_cc_grpc",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "keyvaluestore_client",
-    srcs = [
-        "cpp/keyvaluestore/caching_interceptor.h",
-        "cpp/keyvaluestore/client.cc",
-    ],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":keyvaluestore",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "keyvaluestore_server",
-    srcs = ["cpp/keyvaluestore/server.cc"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":keyvaluestore",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "route_guide_client",
-    srcs = [
-        "cpp/route_guide/helper.cc",
-        "cpp/route_guide/helper.h",
-        "cpp/route_guide/route_guide_client.cc",
-    ],
-    data = ["cpp/route_guide/route_guide_db.json"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":route_guide",
-        "//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "route_guide_server",
-    srcs = [
-        "cpp/route_guide/helper.cc",
-        "cpp/route_guide/helper.h",
-        "cpp/route_guide/route_guide_server.cc",
-    ],
-    data = ["cpp/route_guide/route_guide_db.json"],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        ":route_guide",
-        "//:grpc++",
-    ],
-)
-
-proto_library(
-    name = "route_guide_proto",
-    srcs = ["protos/route_guide.proto"],
-)

examples/cpp/compression/BUILD

@@ -0,0 +1,35 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_binary(
+    name = "compression_client",
+    srcs = ["greeter_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "compression_server",
+    srcs = ["greeter_server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)

examples/cpp/helloworld/BUILD

@@ -0,0 +1,66 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_binary(
+    name = "greeter_client",
+    srcs = ["greeter_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "greeter_async_client",
+    srcs = ["greeter_async_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "greeter_async_client2",
+    srcs = ["greeter_async_client2.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "greeter_server",
+    srcs = ["greeter_server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//:grpc++_reflection",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "greeter_async_server",
+    srcs = ["greeter_async_server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)

examples/cpp/keyvaluestore/BUILD

@@ -0,0 +1,38 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_binary(
+    name = "keyvaluestore_client",
+    srcs = [
+        "caching_interceptor.h",
+        "client.cc",
+    ],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:keyvaluestore",
+    ],
+)
+
+cc_binary(
+    name = "keyvaluestore_server",
+    srcs = ["server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:keyvaluestore",
+    ],
+)

examples/cpp/load_balancing/BUILD

@@ -0,0 +1,35 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_binary(
+    name = "lb_server",
+    srcs = ["greeter_server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "lb_client",
+    srcs = ["greeter_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)

examples/cpp/metadata/BUILD

@@ -0,0 +1,35 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_binary(
+    name = "metadata_client",
+    srcs = ["greeter_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)
+
+cc_binary(
+    name = "metadata_server",
+    srcs = ["greeter_server.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+    ],
+)

examples/cpp/route_guide/BUILD

@@ -0,0 +1,56 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+cc_library(
+    name = "route_guide_helper",
+    srcs = [
+        "helper.cc",
+        "helper.h",
+    ],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:route_guide",
+    ],
+)
+
+cc_binary(
+    name = "route_guide_client",
+    srcs = [
+        "route_guide_client.cc",
+    ],
+    data = ["route_guide_db.json"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        ":route_guide_helper",
+        "//:grpc++",
+        "//examples/protos:route_guide",
+    ],
+)
+
+cc_binary(
+    name = "route_guide_server",
+    srcs = [
+        "route_guide_server.cc",
+    ],
+    data = ["route_guide_db.json"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        ":route_guide_helper",
+        "//:grpc++",
+        "//examples/protos:route_guide",
+    ],
+)

examples/objective-c/BUILD

@@ -22,17 +22,17 @@ load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
 
 objc_grpc_library(
     name = "HelloWorld_grpc_proto",
-    srcs = ["//examples:protos/helloworld.proto"],
+    srcs = ["//examples/protos:helloworld.proto"],
     tags = ["manual"],
-    deps = ["//examples:helloworld_proto"],
+    deps = ["//examples/protos:helloworld_proto"],
 )
 
 # This one works with import "external/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h"
 objc_grpc_library(
     name = "Keyvaluestore_grpc_proto_external",
-    srcs = ["//external/com_github_grpc_grpc/examples:protos/keyvaluestore.proto"],
+    srcs = ["//external/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"],
     tags = ["manual"],
-    deps = ["@com_github_grpc_grpc//examples:keyvaluestore_proto"],
+    deps = ["@com_github_grpc_grpc//examples/protos:keyvaluestore_proto"],
 )
 
 objc_library(
@@ -86,9 +86,9 @@ macos_application(
 
 objc_grpc_library(
     name = "RouteGuide",
-    srcs = ["//examples:protos/route_guide.proto"],
+    srcs = ["//examples/protos:route_guide.proto"],
     tags = ["manual"],
-    deps = ["//examples:route_guide_proto"],
+    deps = ["//examples/protos:route_guide_proto"],
 )
 
 objc_library(

examples/objective-c/helloworld/README.md

@@ -84,7 +84,7 @@ $ bazel build :HelloWorld
 #### Try it!
 To run the Hello World sample properly, we need a local server. Let's compile and run the corresponding C++ server:
 ```shell
-$ bazel run //examples:greeter_server
+$ bazel run //examples/cpp/helloworld:greeter_server
 ```
 
 To run the sample, you need to know the available simulator runtimes in your machine. You could either list the available runtimes yourself by running:

examples/protos/BUILD

@@ -0,0 +1,83 @@
+# Copyright 2020 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+licenses(["notice"])  # 3-clause BSD
+
+package(default_visibility = ["//visibility:public"])
+
+load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("//bazel:grpc_build_system.bzl", "grpc_proto_library")
+load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
+
+grpc_proto_library(
+    name = "auth_sample",
+    srcs = ["auth_sample.proto"],
+)
+
+grpc_proto_library(
+    name = "hellostreamingworld",
+    srcs = ["hellostreamingworld.proto"],
+)
+
+# The following three rules demonstrate the usage of the cc_grpc_library rule in
+# in a mode compatible with the native proto_library and cc_proto_library rules.
+proto_library(
+    name = "helloworld_proto",
+    srcs = ["helloworld.proto"],
+)
+
+cc_proto_library(
+    name = "helloworld_cc_proto",
+    deps = [":helloworld_proto"],
+)
+
+cc_grpc_library(
+    name = "helloworld_cc_grpc",
+    srcs = [":helloworld_proto"],
+    grpc_only = True,
+    deps = [":helloworld_cc_proto"],
+)
+
+grpc_proto_library(
+    name = "route_guide",
+    srcs = ["route_guide.proto"],
+)
+
+proto_library(
+    name = "keyvaluestore_proto",
+    srcs = ["keyvaluestore.proto"],
+)
+
+grpc_proto_library(
+    name = "keyvaluestore",
+    srcs = ["keyvaluestore.proto"],
+)
+
+py_proto_library(
+    name = "helloworld_py_pb2",
+    deps = [":helloworld_proto"],
+)
+
+py_grpc_library(
+    name = "helloworld_py_pb2_grpc",
+    srcs = [":helloworld_proto"],
+    deps = [":helloworld_py_pb2"],
+)
+
+proto_library(
+    name = "route_guide_proto",
+    srcs = [":route_guide.proto"],
+)

examples/python/compression/BUILD.bazel

@@ -18,8 +18,8 @@ py_binary(
     python_version = "PY3",
     srcs_version = "PY2AND3",
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
     ],
 )
@@ -30,8 +30,8 @@ py_binary(
     python_version = "PY3",
     srcs_version = "PY2AND3",
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
     ],
 )

examples/python/compression/client.py

@@ -21,8 +21,8 @@ import argparse
 import logging
 import grpc
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 _DESCRIPTION = 'A client capable of compression.'
 _COMPRESSION_OPTIONS = {

examples/python/compression/server.py

@@ -23,8 +23,8 @@ import logging
 import threading
 import grpc
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 _DESCRIPTION = 'A server capable of compression.'
 _COMPRESSION_OPTIONS = {

examples/python/debug/BUILD.bazel

@@ -19,8 +19,8 @@ py_binary(
     testonly = 1,
     srcs = ["debug_server.py"],
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
         "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz",
     ],
@@ -32,8 +32,8 @@ py_binary(
     srcs = ["send_message.py"],
     python_version = "PY3",
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
     ],
 )
@@ -57,8 +57,8 @@ py_test(
         ":debug_server",
         ":get_stats",
         ":send_message",
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
         "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz",
     ],

examples/python/debug/debug_server.py

@@ -25,8 +25,8 @@ import random
 import grpc
 from grpc_channelz.v1 import channelz
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 _LOGGER = logging.getLogger(__name__)
 _LOGGER.setLevel(logging.INFO)

examples/python/debug/send_message.py

@@ -20,8 +20,8 @@ from __future__ import print_function
 import logging
 import argparse
 import grpc
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 
 def process(stub, request):

examples/python/errors/BUILD.bazel

@@ -19,8 +19,8 @@ py_library(
     testonly = 1,
     srcs = ["client.py"],
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
         "//src/python/grpcio_status/grpc_status",
         requirement("googleapis-common-protos"),
@@ -34,8 +34,8 @@ py_library(
     deps = [
         "//src/python/grpcio/grpc:grpcio",
         "//src/python/grpcio_status/grpc_status:grpc_status",
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
     ] + select({
         "//conditions:default": [requirement("futures")],
         "//:python3": [],

examples/python/errors/client.py

@@ -20,8 +20,8 @@ import grpc
 from grpc_status import rpc_status
 from google.rpc import error_details_pb2
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 _LOGGER = logging.getLogger(__name__)
 

examples/python/errors/server.py

@@ -23,8 +23,8 @@ from grpc_status import rpc_status
 from google.protobuf import any_pb2
 from google.rpc import code_pb2, status_pb2, error_details_pb2
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 
 def create_greet_limit_exceed_error_status(name):

examples/python/errors/test/_error_handling_example_test.py

@@ -26,7 +26,7 @@ import logging
 
 import grpc
 
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2_grpc
 from examples.python.errors import client as error_handling_client
 from examples.python.errors import server as error_handling_server
 

examples/python/wait_for_ready/BUILD.bazel

@@ -19,8 +19,8 @@ py_library(
     testonly = 1,
     srcs = ["wait_for_ready_example.py"],
     deps = [
-        "//examples:helloworld_py_pb2",
-        "//examples:helloworld_py_pb2_grpc",
+        "//examples/protos:helloworld_py_pb2",
+        "//examples/protos:helloworld_py_pb2_grpc",
         "//src/python/grpcio/grpc:grpcio",
     ],
 )

examples/python/wait_for_ready/wait_for_ready_example.py

@@ -22,8 +22,8 @@ import threading
 
 import grpc
 
-from examples import helloworld_pb2
-from examples import helloworld_pb2_grpc
+from examples.protos import helloworld_pb2
+from examples.protos import helloworld_pb2_grpc
 
 _LOGGER = logging.getLogger(__name__)
 _LOGGER.setLevel(logging.INFO)