From b7a467d463a7dd7cf54982f215388b5cf4fad3ac Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Fri, 22 Nov 2019 10:46:00 -0800 Subject: [PATCH] Remove build references to grpc_shadow_boringssl.h --- BUILD | 10 ---------- BUILD.gn | 1 - build.yaml | 6 ------ gRPC-C++.podspec | 2 -- gRPC-Core.podspec | 2 -- grpc.gemspec | 1 - package.xml | 1 - tools/doxygen/Doxyfile.core.internal | 1 - 8 files changed, 24 deletions(-) diff --git a/BUILD b/BUILD index 7cc070e4ba0..d65a16cdc71 100644 --- a/BUILD +++ b/BUILD @@ -1713,7 +1713,6 @@ grpc_cc_library( deps = [ "alts_util", "grpc_base", - "grpc_shadow_boringssl", "grpc_transport_chttp2_alpn", "tsi", ], @@ -1954,7 +1953,6 @@ grpc_cc_library( deps = [ "gpr", "grpc_base", - "grpc_shadow_boringssl", "tsi_interface", ], ) @@ -2023,7 +2021,6 @@ grpc_cc_library( "alts_util", "gpr", "grpc_base", - "grpc_shadow_boringssl", "grpc_transport_chttp2_client_insecure", "tsi_interface", ], @@ -2309,13 +2306,6 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "grpc_shadow_boringssl", - hdrs = [ - "src/core/tsi/grpc_shadow_boringssl.h", - ], -) - # Once upb code-gen issue is resolved, use the targets commented below to replace the ones using # upb-generated files. diff --git a/BUILD.gn b/BUILD.gn index a69a8e0940a..50efcd393e2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -887,7 +887,6 @@ config("grpc_config") { "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h", "src/core/tsi/fake_transport_security.cc", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/grpc_shadow_boringssl.h", "src/core/tsi/local_transport_security.cc", "src/core/tsi/local_transport_security.h", "src/core/tsi/ssl/session_cache/ssl_session.h", diff --git a/build.yaml b/build.yaml index 364f3bfcb50..16e30871791 100644 --- a/build.yaml +++ b/build.yaml @@ -59,7 +59,6 @@ filegroups: - grpc_transport_chttp2_client_insecure - tsi_interface - tsi - - grpc_shadow_boringssl - name: alts_upb headers: - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h @@ -1343,7 +1342,6 @@ filegroups: - grpc_base - grpc_transport_chttp2_alpn - tsi - - grpc_shadow_boringssl - name: grpc_server_backward_compatibility headers: - src/core/ext/filters/workarounds/workaround_utils.h @@ -1351,9 +1349,6 @@ filegroups: - src/core/ext/filters/workarounds/workaround_utils.cc uses: - grpc_base -- name: grpc_shadow_boringssl - headers: - - src/core/tsi/grpc_shadow_boringssl.h - name: grpc_test_util_base headers: - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -1646,7 +1641,6 @@ filegroups: - tsi_interface - grpc_base - grpc_trace - - grpc_shadow_boringssl - name: tsi_interface headers: - src/core/tsi/transport_security.h diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 26340b79601..86456e70612 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -616,7 +616,6 @@ Pod::Spec.new do |s| 'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h', 'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/grpc_shadow_boringssl.h', 'src/core/tsi/local_transport_security.h', 'src/core/tsi/ssl/session_cache/ssl_session.h', 'src/core/tsi/ssl/session_cache/ssl_session_cache.h', @@ -1208,7 +1207,6 @@ Pod::Spec.new do |s| 'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h', 'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/grpc_shadow_boringssl.h', 'src/core/tsi/local_transport_security.h', 'src/core/tsi/ssl/session_cache/ssl_session.h', 'src/core/tsi/ssl/session_cache/ssl_session_cache.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index f09fc1240f0..334750f3412 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -939,7 +939,6 @@ Pod::Spec.new do |s| 'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h', 'src/core/tsi/fake_transport_security.cc', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/grpc_shadow_boringssl.h', 'src/core/tsi/local_transport_security.cc', 'src/core/tsi/local_transport_security.h', 'src/core/tsi/ssl/session_cache/ssl_session.h', @@ -1315,7 +1314,6 @@ Pod::Spec.new do |s| 'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h', 'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h', 'src/core/tsi/fake_transport_security.h', - 'src/core/tsi/grpc_shadow_boringssl.h', 'src/core/tsi/local_transport_security.h', 'src/core/tsi/ssl/session_cache/ssl_session.h', 'src/core/tsi/ssl/session_cache/ssl_session_cache.h', diff --git a/grpc.gemspec b/grpc.gemspec index d3354b1de7e..61d66ce19ec 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -851,7 +851,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h ) s.files += %w( src/core/tsi/fake_transport_security.cc ) s.files += %w( src/core/tsi/fake_transport_security.h ) - s.files += %w( src/core/tsi/grpc_shadow_boringssl.h ) s.files += %w( src/core/tsi/local_transport_security.cc ) s.files += %w( src/core/tsi/local_transport_security.h ) s.files += %w( src/core/tsi/ssl/session_cache/ssl_session.h ) diff --git a/package.xml b/package.xml index fc63e5772b2..2531be6a414 100644 --- a/package.xml +++ b/package.xml @@ -834,7 +834,6 @@ - diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 1b0ff5c5698..95b5f45ae55 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1644,7 +1644,6 @@ src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc \ src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h \ src/core/tsi/fake_transport_security.cc \ src/core/tsi/fake_transport_security.h \ -src/core/tsi/grpc_shadow_boringssl.h \ src/core/tsi/local_transport_security.cc \ src/core/tsi/local_transport_security.h \ src/core/tsi/ssl/session_cache/ssl_session.h \