diff options
| author | ncteisen <ncteisen@gmail.com> | 2018-06-19 14:00:52 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-19 14:00:52 -0700 |
| commit | 68d4f50f77641f80794134f0d4149034df1706f0 (patch) | |
| tree | a8a6a2221c5b408e63d4c51b6cb9773ecca8e566 /grpc.gyp | |
| parent | 4d1da600b525a514f0a5c1d768fa3a58d65ecded (diff) | |
| parent | 9e3e64604d9a3bb4bea9202ede844e6f7b592eeb (diff) | |
| download | grpc-grpc-68d4f50f77641f80794134f0d4149034df1706f0.tar.gz | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -77,6 +77,7 @@ '.', '../..', 'include', + '../../third_party/nanopb', ], 'defines': [ 'GRPC_ARES=0', @@ -537,6 +538,7 @@ 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc', @@ -544,7 +546,7 @@ 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc', 'src/core/ext/filters/load_reporting/server_load_reporting_filter.cc', 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc', - 'src/core/ext/census/grpc_context.cc', + 'src/cpp/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/max_age/max_age_filter.cc', 'src/core/ext/filters/message_size/message_size_filter.cc', 'src/core/ext/filters/http/client_authority_filter.cc', @@ -1250,6 +1252,7 @@ 'src/core/ext/transport/inproc/inproc_plugin.cc', 'src/core/ext/transport/inproc/inproc_transport.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc', @@ -1269,7 +1272,7 @@ 'third_party/nanopb/pb_encode.c', 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/census/grpc_context.cc', + 'src/cpp/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/max_age/max_age_filter.cc', 'src/core/ext/filters/message_size/message_size_filter.cc', 'src/core/ext/filters/http/client_authority_filter.cc', |