Revert "Update the upb submodule for proto.oneof fix in generated code."

This reverts commit 2975571fd3.
pull/18747/head
Alexander Polcyn 6 years ago
parent 1ed8b62508
commit 4ba81610ee
  1. 4
      bazel/grpc_deps.bzl
  2. 2
      third_party/upb
  3. 2
      tools/run_tests/sanity/check_submodules.sh

@ -202,8 +202,8 @@ def grpc_deps():
if "upb" not in native.existing_rules():
http_archive(
name = "upb",
strip_prefix = "upb-cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd",
url = "https://github.com/google/upb/archive/cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd.tar.gz",
strip_prefix = "upb-ed9faae0993704b033c594b072d65e1bf19207fa",
url = "https://github.com/google/upb/archive/ed9faae0993704b033c594b072d65e1bf19207fa.tar.gz",
)
# TODO: move some dependencies from "grpc_deps" here?

2
third_party/upb vendored

@ -1 +1 @@
Subproject commit cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd
Subproject commit fa88c6017ddb490aa78c57bea682193f533ed69a

@ -40,7 +40,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60)
582743bf40c5d3639a70f98f183914a2c0cd0680 third_party/protobuf (v3.7.0-rc.2-20-g582743bf)
e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10)
cf35baa1ad70f0dca734f93bcc2b54d8d059bcdd third_party/upb (heads/master)
fa88c6017ddb490aa78c57bea682193f533ed69a third_party/upb (heads/master)
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
EOF

Loading…
Cancel
Save