diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-04-29 14:35:49 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-04-29 14:35:49 -0700 |
| commit | 5f9f4556820b7a442263839fbc706ff624eb321b (patch) | |
| tree | 06aeefcd4cd832a05be8ee315090084da9457b94 /Makefile | |
| parent | b220c1d21342fb995881c39efb6b4b8c55e89e6b (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge remote-tracking branch 'upstream/master' into stap
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -3192,7 +3192,6 @@ LIBGRPC_SRC = \ src/core/tsi/fake_transport_security.c \ src/core/tsi/ssl_transport_security.c \ src/core/tsi/transport_security.c \ - src/core/channel/call_op_string.c \ src/core/channel/census_filter.c \ src/core/channel/channel_args.c \ src/core/channel/channel_stack.c \ @@ -3201,7 +3200,6 @@ LIBGRPC_SRC = \ src/core/channel/client_setup.c \ src/core/channel/connected_channel.c \ src/core/channel/http_client_filter.c \ - src/core/channel/http_filter.c \ src/core/channel/http_server_filter.c \ src/core/channel/noop_filter.c \ src/core/compression/algorithm.c \ @@ -3290,6 +3288,7 @@ LIBGRPC_SRC = \ src/core/transport/metadata.c \ src/core/transport/stream_op.c \ src/core/transport/transport.c \ + src/core/transport/transport_op_string.c \ PUBLIC_HEADERS_C += \ include/grpc/grpc_security.h \ @@ -3442,7 +3441,6 @@ endif LIBGRPC_UNSECURE_SRC = \ src/core/surface/init_unsecure.c \ - src/core/channel/call_op_string.c \ src/core/channel/census_filter.c \ src/core/channel/channel_args.c \ src/core/channel/channel_stack.c \ @@ -3451,7 +3449,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/channel/client_setup.c \ src/core/channel/connected_channel.c \ src/core/channel/http_client_filter.c \ - src/core/channel/http_filter.c \ src/core/channel/http_server_filter.c \ src/core/channel/noop_filter.c \ src/core/compression/algorithm.c \ @@ -3540,6 +3537,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/transport/metadata.c \ src/core/transport/stream_op.c \ src/core/transport/transport.c \ + src/core/transport/transport_op_string.c \ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ |