diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-18 10:29:04 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-18 10:29:04 -0800 |
| commit | b28c7e8710638b362e5bfdd7dd81a45241c376e8 (patch) | |
| tree | fb8bc4e3e6c705e63bc1a4f441f5c1a624f29558 /CMakeLists.txt | |
| parent | f2752ebb3b81cbad4e3b9ac0df5d7021c4659243 (diff) | |
| parent | 91936b32f67c26f7189b7081bcb53e46ea8ba641 (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 976529cde0..05b9dd7aa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,8 +392,8 @@ add_library(grpc src/core/lib/transport/mdstr_hash_table.c src/core/lib/transport/metadata.c src/core/lib/transport/metadata_batch.c - src/core/lib/transport/method_config.c src/core/lib/transport/pid_controller.c + src/core/lib/transport/service_config.c src/core/lib/transport/static_metadata.c src/core/lib/transport/timeout_encoding.c src/core/lib/transport/transport.c @@ -672,8 +672,8 @@ add_library(grpc_cronet src/core/lib/transport/mdstr_hash_table.c src/core/lib/transport/metadata.c src/core/lib/transport/metadata_batch.c - src/core/lib/transport/method_config.c src/core/lib/transport/pid_controller.c + src/core/lib/transport/service_config.c src/core/lib/transport/static_metadata.c src/core/lib/transport/timeout_encoding.c src/core/lib/transport/transport.c @@ -924,8 +924,8 @@ add_library(grpc_unsecure src/core/lib/transport/mdstr_hash_table.c src/core/lib/transport/metadata.c src/core/lib/transport/metadata_batch.c - src/core/lib/transport/method_config.c src/core/lib/transport/pid_controller.c + src/core/lib/transport/service_config.c src/core/lib/transport/static_metadata.c src/core/lib/transport/timeout_encoding.c src/core/lib/transport/transport.c |