Esun Kim 2 years ago committed by GitHub
parent 0ecc18ef0f
commit ea4204bb51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      bazel/grpc_deps.bzl
  2. 2
      gRPC-Core.podspec
  3. 2
      src/boringssl/boringssl_prefix_symbols.h
  4. 996
      src/objective-c/BoringSSL-GRPC.podspec
  5. 2
      templates/gRPC-Core.podspec.template
  6. 2
      templates/src/objective-c/BoringSSL-GRPC.podspec.template
  7. 2
      third_party/boringssl-with-bazel
  8. 2
      tools/run_tests/sanity/check_submodules.sh

@ -215,11 +215,11 @@ def grpc_deps():
name = "boringssl", name = "boringssl",
# Use github mirror instead of https://boringssl.googlesource.com/boringssl # Use github mirror instead of https://boringssl.googlesource.com/boringssl
# to obtain a boringssl archive with consistent sha256 # to obtain a boringssl archive with consistent sha256
sha256 = "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40", sha256 = "ad0b806b6c5cbd6cae121c608945d5fed468748e330632e8d53315089ad52c67",
strip_prefix = "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2", strip_prefix = "boringssl-6195bf8242156c9a2fa75702eee058f91b86a88b",
urls = [ urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz", "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/6195bf8242156c9a2fa75702eee058f91b86a88b.tar.gz",
"https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz", "https://github.com/google/boringssl/archive/6195bf8242156c9a2fa75702eee058f91b86a88b.tar.gz",
], ],
) )

2
gRPC-Core.podspec generated

@ -179,7 +179,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL-GRPC', '0.0.24' ss.dependency 'BoringSSL-GRPC', '0.0.25'
ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/base/core_headers', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version
ss.dependency 'abseil/cleanup/cleanup', abseil_version ss.dependency 'abseil/cleanup/cleanup', abseil_version

@ -1,4 +1,4 @@
// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: b9232f9e27e5668bc0414879dcdedb2a59ea75f2 // generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 6195bf8242156c9a2fa75702eee058f91b86a88b
// Copyright (c) 2018, Google Inc. // Copyright (c) 2018, Google Inc.
// //

File diff suppressed because it is too large Load Diff

@ -198,7 +198,7 @@
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL-GRPC', '0.0.24' ss.dependency 'BoringSSL-GRPC', '0.0.25'
% for abseil_spec in grpc_abseil_specs: % for abseil_spec in grpc_abseil_specs:
ss.dependency '${abseil_spec}', abseil_version ss.dependency '${abseil_spec}', abseil_version
% endfor % endfor

@ -69,7 +69,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL-GRPC' s.name = 'BoringSSL-GRPC'
version = '0.0.24' version = '0.0.25'
s.version = version s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
# Adapted from the homepage: # Adapted from the homepage:

@ -1 +1 @@
Subproject commit b9232f9e27e5668bc0414879dcdedb2a59ea75f2 Subproject commit 6195bf8242156c9a2fa75702eee058f91b86a88b

@ -28,7 +28,7 @@ cat <<EOF | sort >"$want_submodules"
third_party/abseil-cpp 78be63686ba732b25052be15f8d6dee891c05749 third_party/abseil-cpp 78be63686ba732b25052be15f8d6dee891c05749
third_party/benchmark 361e8d1cfe0c6c36d30b39f1b61302ece5507320 third_party/benchmark 361e8d1cfe0c6c36d30b39f1b61302ece5507320
third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
third_party/boringssl-with-bazel b9232f9e27e5668bc0414879dcdedb2a59ea75f2 third_party/boringssl-with-bazel 6195bf8242156c9a2fa75702eee058f91b86a88b
third_party/cares/cares 6654436a307a5a686b008c1d4c93b0085da6e6d8 third_party/cares/cares 6654436a307a5a686b008c1d4c93b0085da6e6d8
third_party/envoy-api 5962b1204f4b7b0a2ed7622d0149727f602ae74c third_party/envoy-api 5962b1204f4b7b0a2ed7622d0149727f602ae74c
third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92

Loading…
Cancel
Save