From 0c95dad0daa8d4e87272b596d7431ec393870e9d Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Wed, 5 Dec 2018 09:45:41 -0800 Subject: [PATCH] core: fix bazel NameResolverProvider not found --- core/BUILD.bazel | 9 ++++++--- .../META-INF/services/io.grpc.LoadBalancerProvider | 1 + .../META-INF/services/io.grpc.NameResolverProvider | 1 + .../META-INF/services/io.grpc.LoadBalancerProvider | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 core/src/bazel-internal/resources/META-INF/services/io.grpc.LoadBalancerProvider create mode 100644 core/src/bazel-internal/resources/META-INF/services/io.grpc.NameResolverProvider create mode 100644 core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider diff --git a/core/BUILD.bazel b/core/BUILD.bazel index 9d571289e6..06e2f7ca94 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -3,9 +3,6 @@ java_library( srcs = glob([ "src/main/java/io/grpc/*.java", ]), - resources = glob([ - "src/main/resources/**", - ]), visibility = ["//visibility:public"], deps = [ "//context", @@ -36,6 +33,9 @@ java_library( srcs = glob([ "src/main/java/io/grpc/internal/*.java", ]), + resources = glob([ + "src/bazel-internal/resources/**", + ]), visibility = ["//:__subpackages__"], deps = [ ":core", @@ -56,6 +56,9 @@ java_library( srcs = glob([ "src/main/java/io/grpc/util/*.java", ]), + resources = glob([ + "src/bazel-util/resources/**", + ]), visibility = ["//visibility:public"], deps = [ ":core", diff --git a/core/src/bazel-internal/resources/META-INF/services/io.grpc.LoadBalancerProvider b/core/src/bazel-internal/resources/META-INF/services/io.grpc.LoadBalancerProvider new file mode 100644 index 0000000000..bbc367f8fc --- /dev/null +++ b/core/src/bazel-internal/resources/META-INF/services/io.grpc.LoadBalancerProvider @@ -0,0 +1 @@ +io.grpc.internal.PickFirstLoadBalancerProvider diff --git a/core/src/bazel-internal/resources/META-INF/services/io.grpc.NameResolverProvider b/core/src/bazel-internal/resources/META-INF/services/io.grpc.NameResolverProvider new file mode 100644 index 0000000000..ba850091aa --- /dev/null +++ b/core/src/bazel-internal/resources/META-INF/services/io.grpc.NameResolverProvider @@ -0,0 +1 @@ +io.grpc.internal.DnsNameResolverProvider diff --git a/core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider b/core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider new file mode 100644 index 0000000000..4c21dd2e1b --- /dev/null +++ b/core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider @@ -0,0 +1 @@ +io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider