diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-25 16:03:11 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-25 16:03:11 -0800 |
| commit | 5a9d7d2dcc1d2680307938fffb3d8d232b9a0690 (patch) | |
| tree | 3326bc5a99120c37b8b13a8bbce38834366b0ec1 /binding.gyp | |
| parent | 6895168e0ac19699f2a1e35cbf094a5477f00ca7 (diff) | |
| parent | d67b5f7313de5b09928a0ab99a7fbd294d26ceda (diff) | |
Merge github.com:grpc/grpc into filter-selection
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/binding.gyp b/binding.gyp index a6a0ce4c71..25ad6e28af 100644 --- a/binding.gyp +++ b/binding.gyp @@ -504,11 +504,9 @@ 'src/core/support/env_linux.c', 'src/core/support/env_posix.c', 'src/core/support/env_win32.c', - 'src/core/support/file.c', - 'src/core/support/file_posix.c', - 'src/core/support/file_win32.c', 'src/core/support/histogram.c', 'src/core/support/host_port.c', + 'src/core/support/load_file.c', 'src/core/support/log.c', 'src/core/support/log_android.c', 'src/core/support/log_linux.c', @@ -534,6 +532,8 @@ 'src/core/support/time_precise.c', 'src/core/support/time_win32.c', 'src/core/support/tls_pthread.c', + 'src/core/support/tmpfile_posix.c', + 'src/core/support/tmpfile_win32.c', 'src/core/support/wrap_memcpy.c', ], "conditions": [ @@ -574,6 +574,7 @@ 'src/core/client_config/connector.c', 'src/core/client_config/default_initial_connect_string.c', 'src/core/client_config/initial_connect_string.c', + 'src/core/client_config/lb_policies/load_balancer_api.c', 'src/core/client_config/lb_policies/pick_first.c', 'src/core/client_config/lb_policies/round_robin.c', 'src/core/client_config/lb_policy.c', @@ -588,7 +589,7 @@ 'src/core/client_config/subchannel_factory.c', 'src/core/client_config/subchannel_index.c', 'src/core/client_config/uri_parser.c', - 'src/core/compression/algorithm.c', + 'src/core/compression/compression_algorithm.c', 'src/core/compression/message_compress.c', 'src/core/debug/trace.c', 'src/core/httpcli/format_request.c', @@ -638,6 +639,7 @@ 'src/core/json/json_reader.c', 'src/core/json/json_string.c', 'src/core/json/json_writer.c', + 'src/core/proto/grpc/lb/v0/load_balancer.pb.c', 'src/core/surface/alarm.c', 'src/core/surface/api_trace.c', 'src/core/surface/byte_buffer.c', @@ -689,7 +691,7 @@ 'src/core/transport/transport.c', 'src/core/transport/transport_op_string.c', 'src/core/httpcli/httpcli_security_connector.c', - 'src/core/security/base64.c', + 'src/core/security/b64.c', 'src/core/security/client_auth_filter.c', 'src/core/security/credentials.c', 'src/core/security/credentials_metadata.c', @@ -715,6 +717,9 @@ 'src/core/census/operation.c', 'src/core/census/placeholders.c', 'src/core/census/tracing.c', + 'third_party/nanopb/pb_common.c', + 'third_party/nanopb/pb_decode.c', + 'third_party/nanopb/pb_encode.c', ], "conditions": [ ['OS == "mac"', { |