Skip to content

Commit f614fa5

Browse files
committed
Adding upb as submodule
upb will be used for codegen of xDS protos.
1 parent 4036ebb commit f614fa5

File tree

5 files changed

+18
-0
lines changed

5 files changed

+18
-0
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@
5151
[submodule "third_party/protoc-gen-validate"]
5252
path = third_party/protoc-gen-validate
5353
url = https://github.com/lyft/protoc-gen-validate.git
54+
[submodule "third_party/upb"]
55+
path = third_party/upb
56+
url = https://github.com/google/upb.git

bazel/grpc_deps.bzl

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ def grpc_deps():
88
actual = "@com_github_nanopb_nanopb//:nanopb",
99
)
1010

11+
native.bind(
12+
name = "upblib",
13+
actual = "@upb//:upb",
14+
)
15+
1116
native.bind(
1217
name = "absl-base",
1318
actual = "@com_google_absl//absl/base",
@@ -184,6 +189,13 @@ def grpc_deps():
184189
url = "https://github.com/census-instrumentation/opencensus-cpp/archive/fdf0f308b1631bb4a942e32ba5d22536a6170274.tar.gz",
185190
)
186191

192+
if "upb" not in native.existing_rules():
193+
native.http_archive(
194+
name = "upb",
195+
strip_prefix = "upb-9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3",
196+
url = "https://github.com/google/upb/archive/9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3.tar.gz",
197+
)
198+
187199

188200
# TODO: move some dependencies from "grpc_deps" here?
189201
def grpc_test_only_deps():

third_party/upb

Submodule upb added at 9ce4a77

tools/run_tests/sanity/check_bazel_workspace.py

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
_TWISTED_CONSTANTLY_DEP_NAME = 'com_github_twisted_constantly'
4343

4444
_GRPC_DEP_NAMES = [
45+
'upb',
4546
'boringssl',
4647
'com_github_madler_zlib',
4748
'com_google_protobuf',

tools/run_tests/sanity/check_submodules.sh

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
4040
9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60)
4141
48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 third_party/protobuf (v3.6.0.1-37-g48cb18e5)
4242
e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10)
43+
9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3 third_party/upb (heads/upbc-cpp)
4344
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
4445
EOF
4546

0 commit comments

Comments
 (0)