diff options
| author |  Vizerai <jsking@google.com> | 2018-05-29 10:45:32 -0700 |
|---|---|---|
| committer | Vizerai <jsking@google.com> | 2018-05-29 10:45:32 -0700 |
| commit | e501a3d3fdd63a4e8c184ff2bcb1e643dbfe4401 (patch) | |
| tree | f83b87e440fe49217353e7daff913e7e6629e3e5 /bazel | |
| parent | e1d7deeb5396691ae8ea515b0db6e778a2c0a59d (diff) | |
| parent | 1bd0debdc7f57f2d51716789660b895a6c229350 (diff) | |
Merge branch 'master' of https://github.com/Vizerai/grpc into filter_port
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/grpc_deps.bzl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index a48c8786dd..c48115b4f7 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -95,8 +95,8 @@ def grpc_deps(): if "boringssl" not in native.existing_rules(): native.http_archive( name = "boringssl", - # on the master-with-bazel branch - url = "https://boringssl.googlesource.com/boringssl/+archive/886e7d75368e3f4fab3f4d0d3584e4abfc557755.tar.gz", + # on the chromium-stable-with-bazel branch + url = "https://boringssl.googlesource.com/boringssl/+archive/dcd3e6e6ecddf059adb48fca45bc7346a108bdd9.tar.gz", ) if "com_github_madler_zlib" not in native.existing_rules(): @@ -110,8 +110,8 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): native.http_archive( name = "com_google_protobuf", - strip_prefix = "protobuf-2761122b810fe8861004ae785cc3ab39f384d342", - url = "https://github.com/google/protobuf/archive/2761122b810fe8861004ae785cc3ab39f384d342.tar.gz", + strip_prefix = "protobuf-b5fbb742af122b565925987e65c08957739976a7", + url = "https://github.com/google/protobuf/archive/b5fbb742af122b565925987e65c08957739976a7.tar.gz", ) if "com_github_google_googletest" not in native.existing_rules(): @@ -155,12 +155,12 @@ def grpc_deps(): if "com_github_bazelbuild_bazeltoolchains" not in native.existing_rules(): native.http_archive( name = "com_github_bazelbuild_bazeltoolchains", - strip_prefix = "bazel-toolchains-44200e0c026d86c53470d107b3697a3e46469c43", + strip_prefix = "bazel-toolchains-09c850dbb8e785ded3d23a7003e9a0168fe1fb2f", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/44200e0c026d86c53470d107b3697a3e46469c43.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/44200e0c026d86c53470d107b3697a3e46469c43.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/09c850dbb8e785ded3d23a7003e9a0168fe1fb2f.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/09c850dbb8e785ded3d23a7003e9a0168fe1fb2f.tar.gz", ], - sha256 = "699b55a6916c687f4b7dc092dbbf5f64672cde0dc965f79717735ec4e5416556", + sha256 = "08e521cf2d0998e3d27a16c2e2542ebf4d3857b3ddadcfd145d128140754d7bd", ) if "io_opencensus_cpp" not in native.existing_rules(): |