diff options
author | 2018-02-02 09:12:11 -0800 | |
---|---|---|
committer | 2018-02-02 09:12:11 -0800 | |
commit | 4c0640ebd65f2661664f882c673707c1c5807ccd (patch) | |
tree | 4a002106829115e970939568154ed0175e337572 /BUILD | |
parent | 0dbb00eef0e53c87dcd6958839ec0d532cdf858c (diff) | |
parent | e5b0a504167fbc6277d034709aa29ea07fa09a00 (diff) |
Merge branch 'master' into gpr_review3
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -56,7 +56,7 @@ config_setting( # This should be updated along with build.yaml g_stands_for = "glamorous" -core_version = "5.0.0-dev" +core_version = "6.0.0-dev" version = "1.10.0-dev" @@ -116,6 +116,7 @@ GRPCXX_SRCS = [ "src/cpp/client/create_channel_posix.cc", "src/cpp/client/credentials_cc.cc", "src/cpp/client/generic_stub.cc", + "src/cpp/common/alarm.cc", "src/cpp/common/channel_arguments.cc", "src/cpp/common/channel_filter.cc", "src/cpp/common/completion_queue_cc.cc", @@ -724,7 +725,6 @@ grpc_cc_library( "src/core/lib/slice/slice_hash_table.cc", "src/core/lib/slice/slice_intern.cc", "src/core/lib/slice/slice_string_helpers.cc", - "src/core/lib/surface/alarm.cc", "src/core/lib/surface/api_trace.cc", "src/core/lib/surface/byte_buffer.cc", "src/core/lib/surface/byte_buffer_reader.cc", @@ -849,7 +849,6 @@ grpc_cc_library( "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", - "src/core/lib/surface/alarm_internal.h", "src/core/lib/surface/api_trace.h", "src/core/lib/surface/call.h", "src/core/lib/surface/call_test_only.h", @@ -1528,14 +1527,14 @@ grpc_cc_library( grpc_cc_library( name = "tsi", srcs = [ + "src/core/tsi/alts_transport_security.cc", "src/core/tsi/fake_transport_security.cc", - "src/core/tsi/gts_transport_security.cc", "src/core/tsi/ssl_transport_security.cc", "src/core/tsi/transport_security_grpc.cc", ], hdrs = [ + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", "src/core/tsi/transport_security_grpc.h", |