From 24c698f9fa8940446cbc4dd4876cc2070c39e01f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 9 Dec 2020 14:56:14 -0800 Subject: [PATCH] Clean up descriptor.upbdefs dependency --- BUILD | 18 ++++++++---------- BUILD.gn | 2 -- CMakeLists.txt | 1 - Makefile | 1 - bazel/grpc_deps.bzl | 5 +++++ build_autogenerated.yaml | 2 -- grpc.gyp | 1 - tools/doxygen/Doxyfile.c++.internal | 2 -- tools/doxygen/Doxyfile.core.internal | 2 -- 9 files changed, 13 insertions(+), 21 deletions(-) diff --git a/BUILD b/BUILD index 04044db7231..c9d6ad9bccb 100644 --- a/BUILD +++ b/BUILD @@ -2750,7 +2750,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -2798,7 +2798,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -2889,7 +2889,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -2976,7 +2976,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -3015,7 +3015,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -3094,7 +3094,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -3154,7 +3154,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", @@ -3229,7 +3229,6 @@ grpc_cc_library( "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c", "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c", @@ -3241,7 +3240,6 @@ grpc_cc_library( "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h", "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h", @@ -3251,7 +3249,7 @@ grpc_cc_library( ], external_deps = [ "upb_lib", - "upb_lib_descriptor", + "upb_lib_descriptor_reflection", "upb_textformat_lib", ], language = "c++", diff --git a/BUILD.gn b/BUILD.gn index 9dc473d92ab..6071e1e79bd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -684,8 +684,6 @@ config("grpc_config") { "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c", "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h", "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c", diff --git a/CMakeLists.txt b/CMakeLists.txt index 893f27ef8f0..f138241bc35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1694,7 +1694,6 @@ add_library(grpc src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c src/core/ext/upbdefs-generated/google/api/http.upbdefs.c src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c diff --git a/Makefile b/Makefile index aeaadfcd7ea..521ff693c73 100644 --- a/Makefile +++ b/Makefile @@ -1283,7 +1283,6 @@ LIBGRPC_SRC = \ src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \ src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 266967e6eda..a8fc73539da 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -16,6 +16,11 @@ def grpc_deps(): actual = "@upb//:descriptor_upb_proto", ) + native.bind( + name = "upb_lib_descriptor_reflection", + actual = "@upb//:descriptor_upb_proto_reflection", + ) + native.bind( name = "upb_textformat_lib", actual = "@upb//:textformat", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 493d062c251..9ae9f36aade 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -610,7 +610,6 @@ libs: - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h - src/core/ext/upbdefs-generated/google/api/http.upbdefs.h - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h - - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h @@ -1115,7 +1114,6 @@ libs: - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c - src/core/ext/upbdefs-generated/google/api/http.upbdefs.c - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c - - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c diff --git a/grpc.gyp b/grpc.gyp index 782f748f0ab..b21ddb8739c 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -702,7 +702,6 @@ 'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c', 'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c', 'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c', - 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', 'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c', 'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c', 'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c', diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 9bc223c9969..0553200cfbe 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1515,8 +1515,6 @@ src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \ -src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ -src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 07602d1470a..367fb9cfa71 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1351,8 +1351,6 @@ src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \ src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \ -src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ -src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \ src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \ src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \