Update zlib dependency

pull/19182/head
Hao Nguyen 6 years ago
parent 1ddaafd677
commit 79f7abb45e
  1. 2
      BUILD
  2. 8
      bazel/grpc_deps.bzl
  3. 2
      third_party/zlib.BUILD
  4. 2
      tools/run_tests/sanity/check_bazel_workspace.py

@ -1030,7 +1030,7 @@ grpc_cc_library(
"src/core/lib/uri/uri_parser.h", "src/core/lib/uri/uri_parser.h",
], ],
external_deps = [ external_deps = [
"zlib", "madler_zlib",
], ],
language = "c++", language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS, public_hdrs = GRPC_PUBLIC_HDRS,

@ -32,8 +32,8 @@ def grpc_deps():
) )
native.bind( native.bind(
name = "zlib", name = "madler_zlib",
actual = "@com_github_madler_zlib//:z", actual = "@zlib//:zlib",
) )
native.bind( native.bind(
@ -115,9 +115,9 @@ def grpc_deps():
url = "https://boringssl.googlesource.com/boringssl/+archive/afc30d43eef92979b05776ec0963c9cede5fb80f.tar.gz", url = "https://boringssl.googlesource.com/boringssl/+archive/afc30d43eef92979b05776ec0963c9cede5fb80f.tar.gz",
) )
if "com_github_madler_zlib" not in native.existing_rules(): if "zlib" not in native.existing_rules():
http_archive( http_archive(
name = "com_github_madler_zlib", name = "zlib",
build_file = "@com_github_grpc_grpc//third_party:zlib.BUILD", build_file = "@com_github_grpc_grpc//third_party:zlib.BUILD",
sha256 = "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", sha256 = "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45",
strip_prefix = "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", strip_prefix = "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f",

@ -1,5 +1,5 @@
cc_library( cc_library(
name = "z", name = "zlib",
srcs = [ srcs = [
"adler32.c", "adler32.c",
"compress.c", "compress.c",

@ -45,7 +45,7 @@ _TWISTED_CONSTANTLY_DEP_NAME = 'com_github_twisted_constantly'
_GRPC_DEP_NAMES = [ _GRPC_DEP_NAMES = [
'upb', 'upb',
'boringssl', 'boringssl',
'com_github_madler_zlib', 'zlib',
'com_google_protobuf', 'com_google_protobuf',
'com_github_google_googletest', 'com_github_google_googletest',
'com_github_gflags_gflags', 'com_github_gflags_gflags',

Loading…
Cancel
Save