diff options
author | Craig Tiller <ctiller@google.com> | 2017-01-20 15:42:47 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-01-20 15:42:47 -0800 |
commit | da9de8988b343a6c87a9c3ba6b4594020943b0a7 (patch) | |
tree | eee5260113f8aef5919422558900f582753a464d /binding.gyp | |
parent | 1d77059e4b1ec17c704acfc876e321cc33bff99d (diff) | |
parent | 4a4a3a446871da594ef4662751e707789f2829c2 (diff) |
Merge github.com:grpc/grpc into maxmsgsz
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index 479403ed21..9ad914057c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -679,6 +679,8 @@ 'src/core/lib/slice/percent_encoding.c', 'src/core/lib/slice/slice.c', 'src/core/lib/slice/slice_buffer.c', + 'src/core/lib/slice/slice_hash_table.c', + 'src/core/lib/slice/slice_intern.c', 'src/core/lib/slice/slice_string_helpers.c', 'src/core/lib/surface/alarm.c', 'src/core/lib/surface/api_trace.c', @@ -700,12 +702,13 @@ 'src/core/lib/surface/version.c', 'src/core/lib/transport/byte_stream.c', 'src/core/lib/transport/connectivity_state.c', - 'src/core/lib/transport/mdstr_hash_table.c', + 'src/core/lib/transport/error_utils.c', 'src/core/lib/transport/metadata.c', 'src/core/lib/transport/metadata_batch.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/status_conversion.c', 'src/core/lib/transport/timeout_encoding.c', 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', @@ -726,7 +729,6 @@ 'src/core/ext/transport/chttp2/transport/huffsyms.c', 'src/core/ext/transport/chttp2/transport/incoming_metadata.c', 'src/core/ext/transport/chttp2/transport/parsing.c', - 'src/core/ext/transport/chttp2/transport/status_conversion.c', 'src/core/ext/transport/chttp2/transport/stream_lists.c', 'src/core/ext/transport/chttp2/transport/stream_map.c', 'src/core/ext/transport/chttp2/transport/varint.c', @@ -874,6 +876,7 @@ "src/node/ext/node_grpc.cc", "src/node/ext/server.cc", "src/node/ext/server_credentials.cc", + "src/node/ext/slice.cc", "src/node/ext/timeval.cc", ], "dependencies": [ |