build_project
This commit is contained in:
parent
590415e1f3
commit
a65844c63a
|
|
@ -8,32 +8,6 @@ libs:
|
|||
- third_party/address_sorting/address_sorting_internal.h
|
||||
- third_party/address_sorting/include/address_sorting/address_sorting.h
|
||||
src:
|
||||
<<<<<<< HEAD:build.yaml
|
||||
- src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
- src/core/tsi/alts/crypt/gsec.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_counter.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_crypter.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_frame_protector.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc
|
||||
- src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc
|
||||
- src/core/tsi/alts/frame_protector/frame_handler.cc
|
||||
- src/core/tsi/alts/handshaker/alts_handshaker_client.cc
|
||||
- src/core/tsi/alts/handshaker/alts_shared_resource.cc
|
||||
- src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
|
||||
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
|
||||
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
|
||||
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
|
||||
- src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
|
||||
- src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
|
||||
uses:
|
||||
- alts_util
|
||||
- grpc_base
|
||||
- grpc_transport_chttp2_client_insecure
|
||||
- tsi_interface
|
||||
- tsi
|
||||
- name: alts_upb
|
||||
=======
|
||||
- third_party/address_sorting/address_sorting.c
|
||||
- third_party/address_sorting/address_sorting_posix.c
|
||||
- third_party/address_sorting/address_sorting_windows.c
|
||||
|
|
@ -43,7 +17,6 @@ libs:
|
|||
build: private
|
||||
language: c
|
||||
public_headers: []
|
||||
>>>>>>> upstream/master:build_autogenerated.yaml
|
||||
headers:
|
||||
- test/core/end2end/cq_verifier.h
|
||||
- test/core/end2end/data/ssl_test_data.h
|
||||
|
|
@ -744,7 +717,6 @@ libs:
|
|||
- 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
|
||||
|
|
@ -1107,21 +1079,6 @@ libs:
|
|||
- src/core/lib/surface/event_string.cc
|
||||
- src/core/lib/surface/init.cc
|
||||
- src/core/lib/surface/init_secure.cc
|
||||
<<<<<<< HEAD:build.yaml
|
||||
uses:
|
||||
- alts_tsi
|
||||
- grpc_base
|
||||
- grpc_transport_chttp2_alpn
|
||||
- tsi
|
||||
- name: grpc_server_backward_compatibility
|
||||
headers:
|
||||
- src/core/ext/filters/workarounds/workaround_utils.h
|
||||
src:
|
||||
- src/core/ext/filters/workarounds/workaround_utils.cc
|
||||
uses:
|
||||
- grpc_base
|
||||
- name: grpc_test_util_base
|
||||
=======
|
||||
- src/core/lib/surface/lame_client.cc
|
||||
- src/core/lib/surface/metadata_array.cc
|
||||
- src/core/lib/surface/server.cc
|
||||
|
|
@ -1196,7 +1153,6 @@ libs:
|
|||
build: private
|
||||
language: c
|
||||
public_headers: []
|
||||
>>>>>>> upstream/master:build_autogenerated.yaml
|
||||
headers:
|
||||
- test/core/util/cmdline.h
|
||||
- test/core/util/debugger_macros.h
|
||||
|
|
@ -1658,195 +1614,6 @@ libs:
|
|||
- src/core/ext/filters/client_channel/xds/xds_channel.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_client.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_client_stats.cc
|
||||
<<<<<<< HEAD:build.yaml
|
||||
uses:
|
||||
- envoy_ads_upb
|
||||
- grpc_base
|
||||
- grpc_client_channel
|
||||
- name: grpc_xds_client_secure
|
||||
headers:
|
||||
- src/core/ext/filters/client_channel/xds/xds_api.h
|
||||
- src/core/ext/filters/client_channel/xds/xds_bootstrap.h
|
||||
- src/core/ext/filters/client_channel/xds/xds_channel.h
|
||||
- src/core/ext/filters/client_channel/xds/xds_channel_args.h
|
||||
- src/core/ext/filters/client_channel/xds/xds_client.h
|
||||
- src/core/ext/filters/client_channel/xds/xds_client_stats.h
|
||||
src:
|
||||
- src/core/ext/filters/client_channel/xds/xds_api.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_client.cc
|
||||
- src/core/ext/filters/client_channel/xds/xds_client_stats.cc
|
||||
uses:
|
||||
- envoy_ads_upb
|
||||
- grpc_base
|
||||
- grpc_client_channel
|
||||
- grpc_secure
|
||||
- name: grpcpp_channelz_proto
|
||||
src:
|
||||
- src/proto/grpc/channelz/channelz.proto
|
||||
- name: proto_gen_validate_upb
|
||||
headers:
|
||||
- src/core/ext/upb-generated/gogoproto/gogo.upb.h
|
||||
- src/core/ext/upb-generated/validate/validate.upb.h
|
||||
src:
|
||||
- src/core/ext/upb-generated/gogoproto/gogo.upb.c
|
||||
- src/core/ext/upb-generated/validate/validate.upb.c
|
||||
uses:
|
||||
- google_api_upb
|
||||
- name: transport_security_test_lib
|
||||
headers:
|
||||
- test/core/tsi/transport_security_test_lib.h
|
||||
src:
|
||||
- test/core/tsi/transport_security_test_lib.cc
|
||||
deps:
|
||||
- grpc
|
||||
- name: tsi
|
||||
headers:
|
||||
- src/core/tsi/fake_transport_security.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
|
||||
- src/core/tsi/ssl_transport_security.h
|
||||
- src/core/tsi/ssl_types.h
|
||||
- src/core/tsi/transport_security_grpc.h
|
||||
src:
|
||||
- src/core/tsi/fake_transport_security.cc
|
||||
- src/core/tsi/local_transport_security.cc
|
||||
- src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc
|
||||
- src/core/tsi/ssl/session_cache/ssl_session_cache.cc
|
||||
- src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
|
||||
- src/core/tsi/ssl_transport_security.cc
|
||||
- src/core/tsi/transport_security_grpc.cc
|
||||
deps:
|
||||
- gpr
|
||||
uses:
|
||||
- tsi_interface
|
||||
- grpc_base
|
||||
- grpc_trace
|
||||
- name: tsi_interface
|
||||
headers:
|
||||
- src/core/tsi/transport_security.h
|
||||
- src/core/tsi/transport_security_interface.h
|
||||
src:
|
||||
- src/core/tsi/transport_security.cc
|
||||
deps:
|
||||
- gpr
|
||||
uses:
|
||||
- grpc_trace
|
||||
libs:
|
||||
- name: address_sorting
|
||||
build: all
|
||||
language: c
|
||||
headers:
|
||||
- third_party/address_sorting/address_sorting_internal.h
|
||||
- third_party/address_sorting/include/address_sorting/address_sorting.h
|
||||
src:
|
||||
- third_party/address_sorting/address_sorting.c
|
||||
- third_party/address_sorting/address_sorting_posix.c
|
||||
- third_party/address_sorting/address_sorting_windows.c
|
||||
secure: false
|
||||
- name: alts_test_util
|
||||
build: private
|
||||
language: c
|
||||
headers:
|
||||
- test/core/tsi/alts/crypt/gsec_test_util.h
|
||||
- test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h
|
||||
src:
|
||||
- test/core/tsi/alts/crypt/gsec_test_util.cc
|
||||
- test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc
|
||||
deps:
|
||||
- grpc
|
||||
secure: true
|
||||
- name: gpr
|
||||
build: all
|
||||
language: c
|
||||
filegroups:
|
||||
- gpr_base
|
||||
secure: false
|
||||
- name: grpc
|
||||
build: all
|
||||
language: c
|
||||
src:
|
||||
- src/core/lib/surface/init.cc
|
||||
baselib: true
|
||||
deps_linkage: static
|
||||
dll: true
|
||||
filegroups:
|
||||
- grpc_base
|
||||
- grpc_transport_chttp2_server_secure
|
||||
- grpc_transport_chttp2_client_secure
|
||||
- grpc_transport_chttp2_server_insecure
|
||||
- grpc_transport_chttp2_client_insecure
|
||||
- grpc_transport_inproc
|
||||
- grpc_lb_policy_grpclb_secure
|
||||
- grpc_lb_policy_cds_secure
|
||||
- grpc_lb_policy_xds_secure
|
||||
- grpc_lb_policy_pick_first
|
||||
- grpc_lb_policy_round_robin
|
||||
- grpc_resolver_dns_ares
|
||||
- grpc_resolver_dns_native
|
||||
- grpc_resolver_sockaddr
|
||||
- grpc_resolver_fake
|
||||
- grpc_resolver_xds_secure
|
||||
- grpc_secure
|
||||
- census
|
||||
- grpc_client_idle_filter
|
||||
- grpc_max_age_filter
|
||||
- grpc_message_size_filter
|
||||
- grpc_deadline_filter
|
||||
- grpc_client_authority_filter
|
||||
- grpc_workaround_cronet_compression_filter
|
||||
- grpc_server_backward_compatibility
|
||||
generate_plugin_registry: true
|
||||
secure: true
|
||||
- name: grpc_cronet
|
||||
build: all
|
||||
language: c
|
||||
src:
|
||||
- src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc
|
||||
- src/core/lib/surface/init.cc
|
||||
baselib: true
|
||||
deps_linkage: static
|
||||
dll: true
|
||||
filegroups:
|
||||
- grpc_base
|
||||
- grpc_transport_cronet_client_secure
|
||||
- grpc_transport_chttp2_client_secure
|
||||
platforms:
|
||||
- linux
|
||||
secure: true
|
||||
- name: grpc_test_util
|
||||
build: private
|
||||
language: c
|
||||
headers:
|
||||
- test/core/end2end/data/ssl_test_data.h
|
||||
- test/core/security/oauth2_utils.h
|
||||
src:
|
||||
- test/core/end2end/data/client_certs.cc
|
||||
- test/core/end2end/data/server1_cert.cc
|
||||
- test/core/end2end/data/server1_key.cc
|
||||
- test/core/end2end/data/test_root_cert.cc
|
||||
- test/core/security/oauth2_utils.cc
|
||||
deps:
|
||||
- gpr
|
||||
- grpc
|
||||
filegroups:
|
||||
- grpc_test_util_base
|
||||
- name: grpc_test_util_unsecure
|
||||
build: private
|
||||
language: c
|
||||
deps:
|
||||
- gpr
|
||||
- grpc_unsecure
|
||||
filegroups:
|
||||
- grpc_test_util_base
|
||||
secure: false
|
||||
- name: grpc_unsecure
|
||||
build: all
|
||||
language: c
|
||||
src:
|
||||
=======
|
||||
- src/core/ext/filters/client_idle/client_idle_filter.cc
|
||||
- src/core/ext/filters/deadline/deadline_filter.cc
|
||||
- src/core/ext/filters/http/client/http_client_filter.cc
|
||||
|
|
@ -2093,7 +1860,6 @@ libs:
|
|||
- src/core/lib/surface/completion_queue.cc
|
||||
- src/core/lib/surface/completion_queue_factory.cc
|
||||
- src/core/lib/surface/event_string.cc
|
||||
>>>>>>> upstream/master:build_autogenerated.yaml
|
||||
- src/core/lib/surface/init.cc
|
||||
- src/core/lib/surface/init_unsecure.cc
|
||||
- src/core/lib/surface/lame_client.cc
|
||||
|
|
|
|||
|
|
@ -172,11 +172,7 @@ Pod::Spec.new do |s|
|
|||
ss.header_mappings_dir = '.'
|
||||
ss.libraries = 'z'
|
||||
ss.dependency "#{s.name}/Interface", version
|
||||
<<<<<<< HEAD
|
||||
ss.dependency 'BoringSSL-GRPC', '0.0.6'
|
||||
ss.compiler_flags = '-DBORINGSSL_PREFIX=GRPC'
|
||||
=======
|
||||
ss.dependency 'BoringSSL-GRPC', '0.0.7'
|
||||
ss.dependency 'BoringSSL-GRPC', '0.0.8'
|
||||
abseil_version = '1.20200225.0'
|
||||
ss.dependency 'abseil/container/inlined_vector', abseil_version
|
||||
ss.dependency 'abseil/memory/memory', abseil_version
|
||||
|
|
@ -184,8 +180,7 @@ Pod::Spec.new do |s|
|
|||
ss.dependency 'abseil/strings/strings', abseil_version
|
||||
ss.dependency 'abseil/time/time', abseil_version
|
||||
ss.dependency 'abseil/types/optional', abseil_version
|
||||
ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'
|
||||
>>>>>>> upstream/master
|
||||
ss.compiler_flags = '-DBORINGSSL_PREFIX=GRPC'
|
||||
|
||||
ss.source_files = 'src/core/ext/filters/census/grpc_context.cc',
|
||||
'src/core/ext/filters/client_channel/backend_metric.cc',
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y \
|
|||
build-essential \
|
||||
bzip2 \
|
||||
ccache \
|
||||
cmake \
|
||||
curl \
|
||||
dnsutils \
|
||||
gcc \
|
||||
|
|
|
|||
|
|
@ -1876,7 +1876,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 \
|
||||
|
|
|
|||
Loading…
Reference in New Issue