Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24953 from veblush/upb-descriptor

Browse Source 
Clean up descriptor.upbdefs dependency of BUILD
pull/25180/head
Esun Kim 4 years ago committed by GitHub
parent d17ef6be04 24c698f9fa
commit ea22dd6f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      BUILD
  2. 2
      BUILD.gn
  3. 1
      CMakeLists.txt
  4. 1
      Makefile
  5. 5
      bazel/grpc_deps.bzl
  6. 2
      build_autogenerated.yaml
  7. 1
      grpc.gyp
  8. 2
      tools/doxygen/Doxyfile.c++.internal
  9. 2
      tools/doxygen/Doxyfile.core.internal

18
BUILD
Unescape View File

@ -2759,7 +2759,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -2807,7 +2807,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -2898,7 +2898,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -2985,7 +2985,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -3024,7 +3024,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -3103,7 +3103,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -3163,7 +3163,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",
@ -3238,7 +3238,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",
@ -3250,7 +3249,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",
@ -3260,7 +3258,7 @@ grpc_cc_library(
],
external_deps = [
"upb_lib",
"upb_lib_descriptor",
"upb_lib_descriptor_reflection",
"upb_textformat_lib",
],
language = "c++",

2
BUILD.gn
Unescape View File

@ -685,8 +685,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",

1
CMakeLists.txt
Unescape View File

@ -1695,7 +1695,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

1
Makefile
Unescape View File

@ -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 \

5
bazel/grpc_deps.bzl
Unescape View File

@ -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",

2
build_autogenerated.yaml
Unescape View File

@ -612,7 +612,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
@ -1116,7 +1115,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

1
grpc.gyp
Unescape View File

@ -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',

2
tools/doxygen/Doxyfile.c++.internal
Unescape View File

@ -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 \

2
tools/doxygen/Doxyfile.core.internal
Unescape View File

@ -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 \

Write Preview
Loading…
Cancel
Save