Update submodule to head, and update templates to match

This commit is contained in:
murgatroid99 2017-11-09 09:40:51 -08:00
parent d156ca5be2
commit 93cfa4b60b
5 changed files with 323 additions and 358 deletions

View File

@ -63,6 +63,7 @@
'-Wno-long-long', '-Wno-long-long',
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1', '-DOSATOMIC_USE_INLINED=1',
'-Ithird_party/abseil-cpp',
], ],
'ldflags': [ 'ldflags': [
'-g', '-g',
@ -185,6 +186,7 @@
'-Wno-long-long', '-Wno-long-long',
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1', '-DOSATOMIC_USE_INLINED=1',
'-Ithird_party/abseil-cpp',
], ],
'OTHER_CPLUSPLUSFLAGS': [ 'OTHER_CPLUSPLUSFLAGS': [
'-g', '-g',
@ -194,6 +196,7 @@
'-Wno-long-long', '-Wno-long-long',
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1', '-DOSATOMIC_USE_INLINED=1',
'-Ithird_party/abseil-cpp',
'-stdlib=libc++', '-stdlib=libc++',
'-std=c++11', '-std=c++11',
'-Wno-error=deprecated-declarations' '-Wno-error=deprecated-declarations'
@ -598,52 +601,51 @@
'dependencies': [ 'dependencies': [
], ],
'sources': [ 'sources': [
'deps/grpc/src/core/lib/profiling/basic_timers.c', 'deps/grpc/src/core/lib/profiling/basic_timers.cc',
'deps/grpc/src/core/lib/profiling/stap_timers.c', 'deps/grpc/src/core/lib/profiling/stap_timers.cc',
'deps/grpc/src/core/lib/support/alloc.c', 'deps/grpc/src/core/lib/support/alloc.cc',
'deps/grpc/src/core/lib/support/arena.c', 'deps/grpc/src/core/lib/support/arena.cc',
'deps/grpc/src/core/lib/support/atm.c', 'deps/grpc/src/core/lib/support/atm.cc',
'deps/grpc/src/core/lib/support/avl.c', 'deps/grpc/src/core/lib/support/avl.cc',
'deps/grpc/src/core/lib/support/backoff.c', 'deps/grpc/src/core/lib/support/cmdline.cc',
'deps/grpc/src/core/lib/support/cmdline.c', 'deps/grpc/src/core/lib/support/cpu_iphone.cc',
'deps/grpc/src/core/lib/support/cpu_iphone.c', 'deps/grpc/src/core/lib/support/cpu_linux.cc',
'deps/grpc/src/core/lib/support/cpu_linux.c', 'deps/grpc/src/core/lib/support/cpu_posix.cc',
'deps/grpc/src/core/lib/support/cpu_posix.c', 'deps/grpc/src/core/lib/support/cpu_windows.cc',
'deps/grpc/src/core/lib/support/cpu_windows.c', 'deps/grpc/src/core/lib/support/env_linux.cc',
'deps/grpc/src/core/lib/support/env_linux.c', 'deps/grpc/src/core/lib/support/env_posix.cc',
'deps/grpc/src/core/lib/support/env_posix.c', 'deps/grpc/src/core/lib/support/env_windows.cc',
'deps/grpc/src/core/lib/support/env_windows.c', 'deps/grpc/src/core/lib/support/histogram.cc',
'deps/grpc/src/core/lib/support/histogram.c', 'deps/grpc/src/core/lib/support/host_port.cc',
'deps/grpc/src/core/lib/support/host_port.c', 'deps/grpc/src/core/lib/support/log.cc',
'deps/grpc/src/core/lib/support/log.c', 'deps/grpc/src/core/lib/support/log_android.cc',
'deps/grpc/src/core/lib/support/log_android.c', 'deps/grpc/src/core/lib/support/log_linux.cc',
'deps/grpc/src/core/lib/support/log_linux.c', 'deps/grpc/src/core/lib/support/log_posix.cc',
'deps/grpc/src/core/lib/support/log_posix.c', 'deps/grpc/src/core/lib/support/log_windows.cc',
'deps/grpc/src/core/lib/support/log_windows.c', 'deps/grpc/src/core/lib/support/mpscq.cc',
'deps/grpc/src/core/lib/support/mpscq.c', 'deps/grpc/src/core/lib/support/murmur_hash.cc',
'deps/grpc/src/core/lib/support/murmur_hash.c', 'deps/grpc/src/core/lib/support/stack_lockfree.cc',
'deps/grpc/src/core/lib/support/stack_lockfree.c', 'deps/grpc/src/core/lib/support/string.cc',
'deps/grpc/src/core/lib/support/string.c', 'deps/grpc/src/core/lib/support/string_posix.cc',
'deps/grpc/src/core/lib/support/string_posix.c', 'deps/grpc/src/core/lib/support/string_util_windows.cc',
'deps/grpc/src/core/lib/support/string_util_windows.c', 'deps/grpc/src/core/lib/support/string_windows.cc',
'deps/grpc/src/core/lib/support/string_windows.c', 'deps/grpc/src/core/lib/support/subprocess_posix.cc',
'deps/grpc/src/core/lib/support/subprocess_posix.c', 'deps/grpc/src/core/lib/support/subprocess_windows.cc',
'deps/grpc/src/core/lib/support/subprocess_windows.c', 'deps/grpc/src/core/lib/support/sync.cc',
'deps/grpc/src/core/lib/support/sync.c', 'deps/grpc/src/core/lib/support/sync_posix.cc',
'deps/grpc/src/core/lib/support/sync_posix.c', 'deps/grpc/src/core/lib/support/sync_windows.cc',
'deps/grpc/src/core/lib/support/sync_windows.c', 'deps/grpc/src/core/lib/support/thd.cc',
'deps/grpc/src/core/lib/support/thd.c', 'deps/grpc/src/core/lib/support/thd_posix.cc',
'deps/grpc/src/core/lib/support/thd_posix.c', 'deps/grpc/src/core/lib/support/thd_windows.cc',
'deps/grpc/src/core/lib/support/thd_windows.c', 'deps/grpc/src/core/lib/support/time.cc',
'deps/grpc/src/core/lib/support/time.c', 'deps/grpc/src/core/lib/support/time_posix.cc',
'deps/grpc/src/core/lib/support/time_posix.c', 'deps/grpc/src/core/lib/support/time_precise.cc',
'deps/grpc/src/core/lib/support/time_precise.c', 'deps/grpc/src/core/lib/support/time_windows.cc',
'deps/grpc/src/core/lib/support/time_windows.c', 'deps/grpc/src/core/lib/support/tls_pthread.cc',
'deps/grpc/src/core/lib/support/tls_pthread.c', 'deps/grpc/src/core/lib/support/tmpfile_msys.cc',
'deps/grpc/src/core/lib/support/tmpfile_msys.c', 'deps/grpc/src/core/lib/support/tmpfile_posix.cc',
'deps/grpc/src/core/lib/support/tmpfile_posix.c', 'deps/grpc/src/core/lib/support/tmpfile_windows.cc',
'deps/grpc/src/core/lib/support/tmpfile_windows.c', 'deps/grpc/src/core/lib/support/wrap_memcpy.cc',
'deps/grpc/src/core/lib/support/wrap_memcpy.c',
], ],
'conditions': [ 'conditions': [
['OS == "mac"', { ['OS == "mac"', {
@ -661,267 +663,256 @@
'gpr', 'gpr',
], ],
'sources': [ 'sources': [
'deps/grpc/src/core/lib/surface/init.c', 'deps/grpc/src/core/lib/surface/init.cc',
'deps/grpc/src/core/lib/channel/channel_args.c', 'deps/grpc/src/core/lib/backoff/backoff.cc',
'deps/grpc/src/core/lib/channel/channel_stack.c', 'deps/grpc/src/core/lib/channel/channel_args.cc',
'deps/grpc/src/core/lib/channel/channel_stack_builder.c', 'deps/grpc/src/core/lib/channel/channel_stack.cc',
'deps/grpc/src/core/lib/channel/connected_channel.c', 'deps/grpc/src/core/lib/channel/channel_stack_builder.cc',
'deps/grpc/src/core/lib/channel/handshaker.c', 'deps/grpc/src/core/lib/channel/connected_channel.cc',
'deps/grpc/src/core/lib/channel/handshaker_factory.c', 'deps/grpc/src/core/lib/channel/handshaker.cc',
'deps/grpc/src/core/lib/channel/handshaker_registry.c', 'deps/grpc/src/core/lib/channel/handshaker_factory.cc',
'deps/grpc/src/core/lib/compression/compression.c', 'deps/grpc/src/core/lib/channel/handshaker_registry.cc',
'deps/grpc/src/core/lib/compression/message_compress.c', 'deps/grpc/src/core/lib/compression/compression.cc',
'deps/grpc/src/core/lib/compression/stream_compression.c', 'deps/grpc/src/core/lib/compression/message_compress.cc',
'deps/grpc/src/core/lib/compression/stream_compression_gzip.c', 'deps/grpc/src/core/lib/compression/stream_compression.cc',
'deps/grpc/src/core/lib/compression/stream_compression_identity.c', 'deps/grpc/src/core/lib/compression/stream_compression_gzip.cc',
'deps/grpc/src/core/lib/debug/stats.c', 'deps/grpc/src/core/lib/compression/stream_compression_identity.cc',
'deps/grpc/src/core/lib/debug/stats_data.c', 'deps/grpc/src/core/lib/debug/stats.cc',
'deps/grpc/src/core/lib/http/format_request.c', 'deps/grpc/src/core/lib/debug/stats_data.cc',
'deps/grpc/src/core/lib/http/httpcli.c', 'deps/grpc/src/core/lib/http/format_request.cc',
'deps/grpc/src/core/lib/http/parser.c', 'deps/grpc/src/core/lib/http/httpcli.cc',
'deps/grpc/src/core/lib/iomgr/call_combiner.c', 'deps/grpc/src/core/lib/http/parser.cc',
'deps/grpc/src/core/lib/iomgr/closure.c', 'deps/grpc/src/core/lib/iomgr/call_combiner.cc',
'deps/grpc/src/core/lib/iomgr/combiner.c', 'deps/grpc/src/core/lib/iomgr/closure.cc',
'deps/grpc/src/core/lib/iomgr/endpoint.c', 'deps/grpc/src/core/lib/iomgr/combiner.cc',
'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.c', 'deps/grpc/src/core/lib/iomgr/endpoint.cc',
'deps/grpc/src/core/lib/iomgr/endpoint_pair_uv.c', 'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc',
'deps/grpc/src/core/lib/iomgr/endpoint_pair_windows.c', 'deps/grpc/src/core/lib/iomgr/endpoint_pair_uv.cc',
'deps/grpc/src/core/lib/iomgr/error.c', 'deps/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc',
'deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.c', 'deps/grpc/src/core/lib/iomgr/error.cc',
'deps/grpc/src/core/lib/iomgr/ev_epollex_linux.c', 'deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_epollsig_linux.c', 'deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_poll_posix.c', 'deps/grpc/src/core/lib/iomgr/ev_epollsig_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_posix.c', 'deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc',
'deps/grpc/src/core/lib/iomgr/ev_windows.c', 'deps/grpc/src/core/lib/iomgr/ev_posix.cc',
'deps/grpc/src/core/lib/iomgr/exec_ctx.c', 'deps/grpc/src/core/lib/iomgr/ev_windows.cc',
'deps/grpc/src/core/lib/iomgr/executor.c', 'deps/grpc/src/core/lib/iomgr/exec_ctx.cc',
'deps/grpc/src/core/lib/iomgr/gethostname_fallback.c', 'deps/grpc/src/core/lib/iomgr/executor.cc',
'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.c', 'deps/grpc/src/core/lib/iomgr/gethostname_fallback.cc',
'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.c', 'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.cc',
'deps/grpc/src/core/lib/iomgr/iocp_windows.c', 'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc',
'deps/grpc/src/core/lib/iomgr/iomgr.c', 'deps/grpc/src/core/lib/iomgr/iocp_windows.cc',
'deps/grpc/src/core/lib/iomgr/iomgr_posix.c', 'deps/grpc/src/core/lib/iomgr/iomgr.cc',
'deps/grpc/src/core/lib/iomgr/iomgr_uv.c', 'deps/grpc/src/core/lib/iomgr/iomgr_posix.cc',
'deps/grpc/src/core/lib/iomgr/iomgr_windows.c', 'deps/grpc/src/core/lib/iomgr/iomgr_uv.cc',
'deps/grpc/src/core/lib/iomgr/is_epollexclusive_available.c', 'deps/grpc/src/core/lib/iomgr/iomgr_windows.cc',
'deps/grpc/src/core/lib/iomgr/load_file.c', 'deps/grpc/src/core/lib/iomgr/is_epollexclusive_available.cc',
'deps/grpc/src/core/lib/iomgr/lockfree_event.c', 'deps/grpc/src/core/lib/iomgr/load_file.cc',
'deps/grpc/src/core/lib/iomgr/network_status_tracker.c', 'deps/grpc/src/core/lib/iomgr/lockfree_event.cc',
'deps/grpc/src/core/lib/iomgr/polling_entity.c', 'deps/grpc/src/core/lib/iomgr/network_status_tracker.cc',
'deps/grpc/src/core/lib/iomgr/pollset_set_uv.c', 'deps/grpc/src/core/lib/iomgr/polling_entity.cc',
'deps/grpc/src/core/lib/iomgr/pollset_set_windows.c', 'deps/grpc/src/core/lib/iomgr/pollset_set_uv.cc',
'deps/grpc/src/core/lib/iomgr/pollset_uv.c', 'deps/grpc/src/core/lib/iomgr/pollset_set_windows.cc',
'deps/grpc/src/core/lib/iomgr/pollset_windows.c', 'deps/grpc/src/core/lib/iomgr/pollset_uv.cc',
'deps/grpc/src/core/lib/iomgr/resolve_address_posix.c', 'deps/grpc/src/core/lib/iomgr/pollset_windows.cc',
'deps/grpc/src/core/lib/iomgr/resolve_address_uv.c', 'deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc',
'deps/grpc/src/core/lib/iomgr/resolve_address_windows.c', 'deps/grpc/src/core/lib/iomgr/resolve_address_uv.cc',
'deps/grpc/src/core/lib/iomgr/resource_quota.c', 'deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc',
'deps/grpc/src/core/lib/iomgr/sockaddr_utils.c', 'deps/grpc/src/core/lib/iomgr/resource_quota.cc',
'deps/grpc/src/core/lib/iomgr/socket_factory_posix.c', 'deps/grpc/src/core/lib/iomgr/sockaddr_utils.cc',
'deps/grpc/src/core/lib/iomgr/socket_mutator.c', 'deps/grpc/src/core/lib/iomgr/socket_factory_posix.cc',
'deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.c', 'deps/grpc/src/core/lib/iomgr/socket_mutator.cc',
'deps/grpc/src/core/lib/iomgr/socket_utils_linux.c', 'deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc',
'deps/grpc/src/core/lib/iomgr/socket_utils_posix.c', 'deps/grpc/src/core/lib/iomgr/socket_utils_linux.cc',
'deps/grpc/src/core/lib/iomgr/socket_utils_uv.c', 'deps/grpc/src/core/lib/iomgr/socket_utils_posix.cc',
'deps/grpc/src/core/lib/iomgr/socket_utils_windows.c', 'deps/grpc/src/core/lib/iomgr/socket_utils_uv.cc',
'deps/grpc/src/core/lib/iomgr/socket_windows.c', 'deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc',
'deps/grpc/src/core/lib/iomgr/tcp_client_posix.c', 'deps/grpc/src/core/lib/iomgr/socket_windows.cc',
'deps/grpc/src/core/lib/iomgr/tcp_client_uv.c', 'deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc',
'deps/grpc/src/core/lib/iomgr/tcp_client_windows.c', 'deps/grpc/src/core/lib/iomgr/tcp_client_uv.cc',
'deps/grpc/src/core/lib/iomgr/tcp_posix.c', 'deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_posix.c', 'deps/grpc/src/core/lib/iomgr/tcp_posix.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_uv.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc',
'deps/grpc/src/core/lib/iomgr/tcp_server_windows.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_uv.cc',
'deps/grpc/src/core/lib/iomgr/tcp_uv.c', 'deps/grpc/src/core/lib/iomgr/tcp_server_windows.cc',
'deps/grpc/src/core/lib/iomgr/tcp_windows.c', 'deps/grpc/src/core/lib/iomgr/tcp_uv.cc',
'deps/grpc/src/core/lib/iomgr/time_averaged_stats.c', 'deps/grpc/src/core/lib/iomgr/tcp_windows.cc',
'deps/grpc/src/core/lib/iomgr/timer_generic.c', 'deps/grpc/src/core/lib/iomgr/time_averaged_stats.cc',
'deps/grpc/src/core/lib/iomgr/timer_heap.c', 'deps/grpc/src/core/lib/iomgr/timer_generic.cc',
'deps/grpc/src/core/lib/iomgr/timer_manager.c', 'deps/grpc/src/core/lib/iomgr/timer_heap.cc',
'deps/grpc/src/core/lib/iomgr/timer_uv.c', 'deps/grpc/src/core/lib/iomgr/timer_manager.cc',
'deps/grpc/src/core/lib/iomgr/udp_server.c', 'deps/grpc/src/core/lib/iomgr/timer_uv.cc',
'deps/grpc/src/core/lib/iomgr/unix_sockets_posix.c', 'deps/grpc/src/core/lib/iomgr/udp_server.cc',
'deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.c', 'deps/grpc/src/core/lib/iomgr/unix_sockets_posix.cc',
'deps/grpc/src/core/lib/iomgr/wakeup_fd_cv.c', 'deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc',
'deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.c', 'deps/grpc/src/core/lib/iomgr/wakeup_fd_cv.cc',
'deps/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.c', 'deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc',
'deps/grpc/src/core/lib/iomgr/wakeup_fd_pipe.c', 'deps/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.cc',
'deps/grpc/src/core/lib/iomgr/wakeup_fd_posix.c', 'deps/grpc/src/core/lib/iomgr/wakeup_fd_pipe.cc',
'deps/grpc/src/core/lib/json/json.c', 'deps/grpc/src/core/lib/iomgr/wakeup_fd_posix.cc',
'deps/grpc/src/core/lib/json/json_reader.c', 'deps/grpc/src/core/lib/json/json.cc',
'deps/grpc/src/core/lib/json/json_string.c', 'deps/grpc/src/core/lib/json/json_reader.cc',
'deps/grpc/src/core/lib/json/json_writer.c', 'deps/grpc/src/core/lib/json/json_string.cc',
'deps/grpc/src/core/lib/slice/b64.c', 'deps/grpc/src/core/lib/json/json_writer.cc',
'deps/grpc/src/core/lib/slice/percent_encoding.c', 'deps/grpc/src/core/lib/slice/b64.cc',
'deps/grpc/src/core/lib/slice/slice.c', 'deps/grpc/src/core/lib/slice/percent_encoding.cc',
'deps/grpc/src/core/lib/slice/slice_buffer.c', 'deps/grpc/src/core/lib/slice/slice.cc',
'deps/grpc/src/core/lib/slice/slice_hash_table.c', 'deps/grpc/src/core/lib/slice/slice_buffer.cc',
'deps/grpc/src/core/lib/slice/slice_intern.c', 'deps/grpc/src/core/lib/slice/slice_hash_table.cc',
'deps/grpc/src/core/lib/slice/slice_string_helpers.c', 'deps/grpc/src/core/lib/slice/slice_intern.cc',
'deps/grpc/src/core/lib/surface/alarm.c', 'deps/grpc/src/core/lib/slice/slice_string_helpers.cc',
'deps/grpc/src/core/lib/surface/api_trace.c', 'deps/grpc/src/core/lib/surface/alarm.cc',
'deps/grpc/src/core/lib/surface/byte_buffer.c', 'deps/grpc/src/core/lib/surface/api_trace.cc',
'deps/grpc/src/core/lib/surface/byte_buffer_reader.c', 'deps/grpc/src/core/lib/surface/byte_buffer.cc',
'deps/grpc/src/core/lib/surface/call.c', 'deps/grpc/src/core/lib/surface/byte_buffer_reader.cc',
'deps/grpc/src/core/lib/surface/call_details.c', 'deps/grpc/src/core/lib/surface/call.cc',
'deps/grpc/src/core/lib/surface/call_log_batch.c', 'deps/grpc/src/core/lib/surface/call_details.cc',
'deps/grpc/src/core/lib/surface/channel.c', 'deps/grpc/src/core/lib/surface/call_log_batch.cc',
'deps/grpc/src/core/lib/surface/channel_init.c', 'deps/grpc/src/core/lib/surface/channel.cc',
'deps/grpc/src/core/lib/surface/channel_ping.c', 'deps/grpc/src/core/lib/surface/channel_init.cc',
'deps/grpc/src/core/lib/surface/channel_stack_type.c', 'deps/grpc/src/core/lib/surface/channel_ping.cc',
'deps/grpc/src/core/lib/surface/completion_queue.c', 'deps/grpc/src/core/lib/surface/channel_stack_type.cc',
'deps/grpc/src/core/lib/surface/completion_queue_factory.c', 'deps/grpc/src/core/lib/surface/completion_queue.cc',
'deps/grpc/src/core/lib/surface/event_string.c', 'deps/grpc/src/core/lib/surface/completion_queue_factory.cc',
'deps/grpc/src/core/lib/surface/event_string.cc',
'deps/grpc/src/core/lib/surface/lame_client.cc', 'deps/grpc/src/core/lib/surface/lame_client.cc',
'deps/grpc/src/core/lib/surface/metadata_array.c', 'deps/grpc/src/core/lib/surface/metadata_array.cc',
'deps/grpc/src/core/lib/surface/server.c', 'deps/grpc/src/core/lib/surface/server.cc',
'deps/grpc/src/core/lib/surface/validate_metadata.c', 'deps/grpc/src/core/lib/surface/validate_metadata.cc',
'deps/grpc/src/core/lib/surface/version.c', 'deps/grpc/src/core/lib/surface/version.cc',
'deps/grpc/src/core/lib/transport/bdp_estimator.c', 'deps/grpc/src/core/lib/transport/bdp_estimator.cc',
'deps/grpc/src/core/lib/transport/byte_stream.c', 'deps/grpc/src/core/lib/transport/byte_stream.cc',
'deps/grpc/src/core/lib/transport/connectivity_state.c', 'deps/grpc/src/core/lib/transport/connectivity_state.cc',
'deps/grpc/src/core/lib/transport/error_utils.c', 'deps/grpc/src/core/lib/transport/error_utils.cc',
'deps/grpc/src/core/lib/transport/metadata.c', 'deps/grpc/src/core/lib/transport/metadata.cc',
'deps/grpc/src/core/lib/transport/metadata_batch.c', 'deps/grpc/src/core/lib/transport/metadata_batch.cc',
'deps/grpc/src/core/lib/transport/pid_controller.c', 'deps/grpc/src/core/lib/transport/pid_controller.cc',
'deps/grpc/src/core/lib/transport/service_config.c', 'deps/grpc/src/core/lib/transport/service_config.cc',
'deps/grpc/src/core/lib/transport/static_metadata.c', 'deps/grpc/src/core/lib/transport/static_metadata.cc',
'deps/grpc/src/core/lib/transport/status_conversion.c', 'deps/grpc/src/core/lib/transport/status_conversion.cc',
'deps/grpc/src/core/lib/transport/timeout_encoding.c', 'deps/grpc/src/core/lib/transport/timeout_encoding.cc',
'deps/grpc/src/core/lib/transport/transport.c', 'deps/grpc/src/core/lib/transport/transport.cc',
'deps/grpc/src/core/lib/transport/transport_op_string.c', 'deps/grpc/src/core/lib/transport/transport_op_string.cc',
'deps/grpc/src/core/lib/debug/trace.c', 'deps/grpc/src/core/lib/debug/trace.cc',
'deps/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'deps/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_plugin.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_plugin.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_table.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/hpack_table.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/http2_settings.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/http2_settings.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/huffsyms.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/huffsyms.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/parsing.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/parsing.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/stream_map.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/stream_map.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/varint.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/varint.cc',
'deps/grpc/src/core/ext/transport/chttp2/transport/writing.c', 'deps/grpc/src/core/ext/transport/chttp2/transport/writing.cc',
'deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.c', 'deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.cc',
'deps/grpc/src/core/ext/filters/http/client/http_client_filter.c', 'deps/grpc/src/core/ext/filters/http/client/http_client_filter.cc',
'deps/grpc/src/core/ext/filters/http/http_filters_plugin.c', 'deps/grpc/src/core/ext/filters/http/http_filters_plugin.cc',
'deps/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.c', 'deps/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.cc',
'deps/grpc/src/core/ext/filters/http/server/http_server_filter.c', 'deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc',
'deps/grpc/src/core/lib/http/httpcli_security_connector.c', 'deps/grpc/src/core/lib/http/httpcli_security_connector.cc',
'deps/grpc/src/core/lib/security/context/security_context.c', 'deps/grpc/src/core/lib/security/context/security_context.cc',
'deps/grpc/src/core/lib/security/credentials/composite/composite_credentials.c', 'deps/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/credentials.c', 'deps/grpc/src/core/lib/security/credentials/credentials.cc',
'deps/grpc/src/core/lib/security/credentials/credentials_metadata.c', 'deps/grpc/src/core/lib/security/credentials/credentials_metadata.cc',
'deps/grpc/src/core/lib/security/credentials/fake/fake_credentials.c', 'deps/grpc/src/core/lib/security/credentials/fake/fake_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/google_default/credentials_generic.c', 'deps/grpc/src/core/lib/security/credentials/google_default/credentials_generic.cc',
'deps/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.c', 'deps/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/iam/iam_credentials.c', 'deps/grpc/src/core/lib/security/credentials/iam/iam_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/jwt/json_token.c', 'deps/grpc/src/core/lib/security/credentials/jwt/json_token.cc',
'deps/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.c', 'deps/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.c', 'deps/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc',
'deps/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.c', 'deps/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.c', 'deps/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc',
'deps/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.c', 'deps/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc',
'deps/grpc/src/core/lib/security/transport/client_auth_filter.c', 'deps/grpc/src/core/lib/security/transport/client_auth_filter.cc',
'deps/grpc/src/core/lib/security/transport/lb_targets_info.c', 'deps/grpc/src/core/lib/security/transport/lb_targets_info.cc',
'deps/grpc/src/core/lib/security/transport/secure_endpoint.c', 'deps/grpc/src/core/lib/security/transport/secure_endpoint.cc',
'deps/grpc/src/core/lib/security/transport/security_connector.c', 'deps/grpc/src/core/lib/security/transport/security_connector.cc',
'deps/grpc/src/core/lib/security/transport/security_handshaker.c', 'deps/grpc/src/core/lib/security/transport/security_handshaker.cc',
'deps/grpc/src/core/lib/security/transport/server_auth_filter.c', 'deps/grpc/src/core/lib/security/transport/server_auth_filter.cc',
'deps/grpc/src/core/lib/security/transport/tsi_error.c', 'deps/grpc/src/core/lib/security/transport/tsi_error.cc',
'deps/grpc/src/core/lib/security/util/json_util.c', 'deps/grpc/src/core/lib/security/util/json_util.cc',
'deps/grpc/src/core/lib/surface/init_secure.c', 'deps/grpc/src/core/lib/surface/init_secure.cc',
'deps/grpc/src/core/tsi/fake_transport_security.c', 'deps/grpc/src/core/tsi/fake_transport_security.cc',
'deps/grpc/src/core/tsi/gts_transport_security.c', 'deps/grpc/src/core/tsi/gts_transport_security.cc',
'deps/grpc/src/core/tsi/ssl_transport_security.c', 'deps/grpc/src/core/tsi/ssl_transport_security.cc',
'deps/grpc/src/core/tsi/transport_security_grpc.c', 'deps/grpc/src/core/tsi/transport_security_grpc.cc',
'deps/grpc/src/core/tsi/transport_security.c', 'deps/grpc/src/core/tsi/transport_security.cc',
'deps/grpc/src/core/tsi/transport_security_adapter.c', 'deps/grpc/src/core/tsi/transport_security_adapter.cc',
'deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.c', 'deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc',
'deps/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'deps/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
'deps/grpc/src/core/ext/filters/client_channel/channel_connectivity.c', 'deps/grpc/src/core/ext/filters/client_channel/backup_poller.cc',
'deps/grpc/src/core/ext/filters/client_channel/client_channel.c', 'deps/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc',
'deps/grpc/src/core/ext/filters/client_channel/client_channel_factory.c', 'deps/grpc/src/core/ext/filters/client_channel/client_channel.cc',
'deps/grpc/src/core/ext/filters/client_channel/client_channel_plugin.c', 'deps/grpc/src/core/ext/filters/client_channel/client_channel_factory.cc',
'deps/grpc/src/core/ext/filters/client_channel/connector.c', 'deps/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc',
'deps/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.c', 'deps/grpc/src/core/ext/filters/client_channel/connector.cc',
'deps/grpc/src/core/ext/filters/client_channel/http_proxy.c', 'deps/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy.c', 'deps/grpc/src/core/ext/filters/client_channel/http_proxy.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy_factory.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy_registry.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_factory.cc',
'deps/grpc/src/core/ext/filters/client_channel/parse_address.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc',
'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper.c', 'deps/grpc/src/core/ext/filters/client_channel/parse_address.cc',
'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper_registry.c', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver.c', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver_factory.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver_registry.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver_factory.cc',
'deps/grpc/src/core/ext/filters/client_channel/retry_throttle.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver_registry.cc',
'deps/grpc/src/core/ext/filters/client_channel/subchannel.c', 'deps/grpc/src/core/ext/filters/client_channel/retry_throttle.cc',
'deps/grpc/src/core/ext/filters/client_channel/subchannel_index.c', 'deps/grpc/src/core/ext/filters/client_channel/subchannel.cc',
'deps/grpc/src/core/ext/filters/client_channel/uri_parser.c', 'deps/grpc/src/core/ext/filters/client_channel/subchannel_index.cc',
'deps/grpc/src/core/ext/filters/deadline/deadline_filter.c', 'deps/grpc/src/core/ext/filters/client_channel/uri_parser.cc',
'deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.c', 'deps/grpc/src/core/ext/filters/deadline/deadline_filter.cc',
'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc',
'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc',
'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc',
'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c', 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
'deps/grpc/src/core/ext/transport/inproc/inproc_plugin.c', 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
'deps/grpc/src/core/ext/transport/inproc/inproc_transport.c', 'deps/grpc/src/core/ext/transport/inproc/inproc_plugin.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.c', 'deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
'deps/grpc/third_party/nanopb/pb_common.c', 'deps/grpc/third_party/nanopb/pb_common.c',
'deps/grpc/third_party/nanopb/pb_decode.c', 'deps/grpc/third_party/nanopb/pb_decode.c',
'deps/grpc/third_party/nanopb/pb_encode.c', 'deps/grpc/third_party/nanopb/pb_encode.c',
'deps/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_plugin.c', 'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc',
'deps/grpc/src/core/ext/census/base_resources.c', 'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
'deps/grpc/src/core/ext/census/context.c', 'deps/grpc/src/core/ext/census/grpc_context.cc',
'deps/grpc/src/core/ext/census/gen/census.pb.c', 'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc',
'deps/grpc/src/core/ext/census/gen/trace_context.pb.c', 'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc',
'deps/grpc/src/core/ext/census/grpc_context.c', 'deps/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
'deps/grpc/src/core/ext/census/grpc_filter.c', 'deps/grpc/src/core/ext/filters/workarounds/workaround_utils.cc',
'deps/grpc/src/core/ext/census/grpc_plugin.c', 'deps/grpc/src/core/plugin_registry/grpc_plugin_registry.cc',
'deps/grpc/src/core/ext/census/initialize.c',
'deps/grpc/src/core/ext/census/intrusive_hash_map.c',
'deps/grpc/src/core/ext/census/mlog.c',
'deps/grpc/src/core/ext/census/operation.c',
'deps/grpc/src/core/ext/census/placeholders.c',
'deps/grpc/src/core/ext/census/resource.c',
'deps/grpc/src/core/ext/census/trace_context.c',
'deps/grpc/src/core/ext/census/tracing.c',
'deps/grpc/src/core/ext/filters/max_age/max_age_filter.c',
'deps/grpc/src/core/ext/filters/message_size/message_size_filter.c',
'deps/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.c',
'deps/grpc/src/core/ext/filters/workarounds/workaround_utils.c',
'deps/grpc/src/core/plugin_registry/grpc_plugin_registry.c',
], ],
'conditions': [ 'conditions': [
['OS == "mac"', { ['OS == "mac"', {
@ -964,17 +955,7 @@
], ],
"target_name": "grpc_node", "target_name": "grpc_node",
"sources": [ "sources": [
"ext/byte_buffer.cc", "<!@(node -p \"require('fs').readdirSync('./ext').map(f=>'ext/'+f).join(' ')\")"
"ext/call.cc",
"ext/call_credentials.cc",
"ext/channel.cc",
"ext/channel_credentials.cc",
"ext/completion_queue.cc",
"ext/node_grpc.cc",
"ext/server.cc",
"ext/server_credentials.cc",
"ext/slice.cc",
"ext/timeval.cc",
], ],
"dependencies": [ "dependencies": [
"grpc", "grpc",

@ -1 +1 @@
Subproject commit ebae8a8c9f15425da8f07442642ca308f3c6612c Subproject commit 4d4fab1e60c18e89635ce099b50defede5e3f026

View File

@ -56,13 +56,13 @@
"src/*.js", "src/*.js",
"ext/*.{cc,h}", "ext/*.{cc,h}",
"deps/grpc/include/grpc/**/*.h", "deps/grpc/include/grpc/**/*.h",
"deps/grpc/src/core/**/*.{c,h}", "deps/grpc/src/core/**/*.{c,cc,h}",
"deps/grpc/src/boringssl/*.{c,h}", "deps/grpc/src/boringssl/*.{c,cc,h}",
"deps/grpc/third_party/nanopb/*.{c,h}", "deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/zlib/**/*.{c,h}", "deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/crypto/**/*.{c,h}", "deps/grpc/third_party/boringssl/crypto/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/include/**/*.{c,h}", "deps/grpc/third_party/boringssl/include/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/ssl/**/*.{c,h}", "deps/grpc/third_party/boringssl/ssl/**/*.{c,cc,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}", "deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"binding.gyp" "binding.gyp"
], ],

View File

@ -188,9 +188,8 @@
'conditions': [ 'conditions': [
['OS=="win" or runtime=="electron"', { ['OS=="win" or runtime=="electron"', {
'targets': [ 'targets': [
% for module in node_modules:
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name == 'boringssl': % if lib.name == 'boringssl':
{ {
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
@ -218,7 +217,6 @@
}, },
% endif % endif
% endfor % endfor
% endfor
], ],
}], }],
['OS == "win" and runtime!="electron"', { ['OS == "win" and runtime!="electron"', {
@ -254,9 +252,8 @@
['OS == "win"', { ['OS == "win"', {
'targets': [ 'targets': [
# Only want to compile zlib under Windows # Only want to compile zlib under Windows
% for module in node_modules:
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name == 'z': % if lib.name == 'z':
{ {
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
@ -274,14 +271,14 @@
}, },
% endif % endif
% endfor % endfor
% endfor
] ]
}] }]
], ],
'targets': [ 'targets': [
% for module in node_modules: % for core in libs:
% if core.name == 'grpc':
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name not in ('boringssl', 'z'): % if lib.name == core.name or (lib.name in core.transitive_deps and lib.name not in ('boringssl', 'z')):
{ {
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
@ -306,6 +303,8 @@
}, },
% endif % endif
% endfor % endfor
% endif
% endfor
{ {
'include_dirs': [ 'include_dirs': [
"<!(node -e \"require('nan')\")" "<!(node -e \"require('nan')\")"
@ -318,20 +317,12 @@
"conditions": [ "conditions": [
['OS=="win" or runtime=="electron"', { ['OS=="win" or runtime=="electron"', {
'dependencies': [ 'dependencies': [
% for dep in getattr(module, 'deps', []): "boringssl",
% if dep == 'boringssl':
"${dep}",
% endif
% endfor
] ]
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
% for dep in getattr(module, 'deps', []): "z",
% if dep == 'z':
"${dep}",
% endif
% endfor
] ]
}], }],
['OS=="linux"', { ['OS=="linux"', {
@ -345,22 +336,15 @@
} }
}] }]
], ],
"target_name": "${module.name}", "target_name": "grpc_node",
"sources": [ "sources": [
% for source in module.src: "<!@(node -p \"require('fs').readdirSync('./ext').map(f=>'ext/'+f).join(' ')\")"
## temporary hack until we get the build.yaml out of grpc.
"${source[len('src/node/'):]}",
% endfor
], ],
"dependencies": [ "dependencies": [
% for dep in getattr(module, 'deps', []): "grpc",
% if dep not in ('boringssl', 'z'): "gpr",
"${dep}",
% endif
% endfor
] ]
}, },
% endfor
{ {
"target_name": "action_after_build", "target_name": "action_after_build",
"type": "none", "type": "none",

View File

@ -2,7 +2,7 @@
--- | --- |
{ {
"name": "grpc", "name": "grpc",
"version": "${settings.node_version}", "version": "${settings.version}",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",
@ -58,13 +58,13 @@
"src/*.js", "src/*.js",
"ext/*.{cc,h}", "ext/*.{cc,h}",
"deps/grpc/include/grpc/**/*.h", "deps/grpc/include/grpc/**/*.h",
"deps/grpc/src/core/**/*.{c,h}", "deps/grpc/src/core/**/*.{c,cc,h}",
"deps/grpc/src/boringssl/*.{c,h}", "deps/grpc/src/boringssl/*.{c,cc,h}",
"deps/grpc/third_party/nanopb/*.{c,h}", "deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/zlib/**/*.{c,h}", "deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/crypto/**/*.{c,h}", "deps/grpc/third_party/boringssl/crypto/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/include/**/*.{c,h}", "deps/grpc/third_party/boringssl/include/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/ssl/**/*.{c,h}", "deps/grpc/third_party/boringssl/ssl/**/*.{c,cc,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}", "deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"binding.gyp" "binding.gyp"
], ],