From 516db56cd8b14f0ee092bd591723f60cfc76ad7c Mon Sep 17 00:00:00 2001 From: easy Date: Mon, 26 Aug 2019 13:51:22 +1000 Subject: [PATCH] Remove grpc_java dependency and java_proto rules. This is so that Envoy can consume opencensus-proto without adding a dependency on grpc_java. --- src/WORKSPACE | 11 ----------- src/opencensus/proto/agent/metrics/v1/BUILD.bazel | 12 ------------ src/opencensus/proto/agent/trace/v1/BUILD.bazel | 12 ------------ 3 files changed, 35 deletions(-) diff --git a/src/WORKSPACE b/src/WORKSPACE index 3b3911c..ec652e8 100644 --- a/src/WORKSPACE +++ b/src/WORKSPACE @@ -17,17 +17,6 @@ workspace(name = "opencensus_proto") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -# Import grpc_java for java_grpc_library(). -git_repository( - name = "grpc_java", - remote = "https://github.com/grpc/grpc-java.git", - tag = "v1.22.1", -) - -load("@grpc_java//:repositories.bzl", "grpc_java_repositories") - -grpc_java_repositories() - # Import grpc for cc_grpc_library(). http_archive( name = "com_github_grpc_grpc", diff --git a/src/opencensus/proto/agent/metrics/v1/BUILD.bazel b/src/opencensus/proto/agent/metrics/v1/BUILD.bazel index 504ebe7..0ec93bc 100644 --- a/src/opencensus/proto/agent/metrics/v1/BUILD.bazel +++ b/src/opencensus/proto/agent/metrics/v1/BUILD.bazel @@ -14,7 +14,6 @@ package(default_visibility = ["//visibility:public"]) -load("@grpc_java//:java_grpc_library.bzl", "java_grpc_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") @@ -40,17 +39,6 @@ cc_grpc_library( grpc_only = True, ) -java_proto_library( - name = "metrics_service_proto_java", - deps = [":metrics_service_proto"], -) - -java_grpc_library( - name = "metrics_service_grpc_java", - srcs = [":metrics_service_proto"], - deps = [":metrics_service_proto_java"], -) - go_proto_library( name = "metrics_service_proto_go", proto = ":metrics_service_proto", diff --git a/src/opencensus/proto/agent/trace/v1/BUILD.bazel b/src/opencensus/proto/agent/trace/v1/BUILD.bazel index 4c610de..2092dcf 100644 --- a/src/opencensus/proto/agent/trace/v1/BUILD.bazel +++ b/src/opencensus/proto/agent/trace/v1/BUILD.bazel @@ -14,7 +14,6 @@ package(default_visibility = ["//visibility:public"]) -load("@grpc_java//:java_grpc_library.bzl", "java_grpc_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") @@ -41,17 +40,6 @@ cc_grpc_library( grpc_only = True, ) -java_proto_library( - name = "trace_service_proto_java", - deps = [":trace_service_proto"], -) - -java_grpc_library( - name = "trace_service_grpc_java", - srcs = [":trace_service_proto"], - deps = [":trace_service_proto_java"], -) - go_proto_library( name = "trace_service_proto_go", proto = ":trace_service_proto",