diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-19 15:41:42 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-19 15:41:42 -0700 |
| commit | b5ab8a29f5e996c6be65212081cc219f100f57fb (patch) | |
| tree | 162021ee2d2932bb193a53426a020576d623b291 /binding.gyp | |
| parent | c22adbcd1f67b652faafebf3e95809b755037ca8 (diff) | |
| parent | e2a1bf46f975a47497977a19a556dd9f07ae944a (diff) | |
Merge branch 'master' of github.com:grpc/grpc into microchannels
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/binding.gyp b/binding.gyp index 39036b3b2a..ae5d0a317f 100644 --- a/binding.gyp +++ b/binding.gyp @@ -54,6 +54,24 @@ 'include_dirs': [ '.', 'include' + ], + 'conditions': [ + ['OS != "win"', { + 'conditions': [ + ['config=="gcov"', { + 'cflags': [ + '-ftest-coverage', + '-fprofile-arcs', + '-O0' + ], + 'ldflags': [ + '-ftest-coverage', + '-fprofile-arcs' + ] + } + ] + ] + }], ] }, 'targets': [ @@ -140,6 +158,7 @@ 'src/core/channel/channel_args.c', 'src/core/channel/channel_stack.c', 'src/core/channel/client_channel.c', + 'src/core/channel/client_uchannel.c', 'src/core/channel/compress_filter.c', 'src/core/channel/connected_channel.c', 'src/core/channel/http_client_filter.c', @@ -168,13 +187,12 @@ 'src/core/httpcli/format_request.c', 'src/core/httpcli/httpcli.c', 'src/core/httpcli/parser.c', - 'src/core/iomgr/alarm.c', - 'src/core/iomgr/alarm_heap.c', 'src/core/iomgr/closure.c', 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', 'src/core/iomgr/exec_ctx.c', + 'src/core/iomgr/executor.c', 'src/core/iomgr/fd_posix.c', 'src/core/iomgr/iocp_windows.c', 'src/core/iomgr/iomgr.c', @@ -200,6 +218,8 @@ 'src/core/iomgr/tcp_server_windows.c', 'src/core/iomgr/tcp_windows.c', 'src/core/iomgr/time_averaged_stats.c', + 'src/core/iomgr/timer.c', + 'src/core/iomgr/timer_heap.c', 'src/core/iomgr/udp_server.c', 'src/core/iomgr/wakeup_fd_eventfd.c', 'src/core/iomgr/wakeup_fd_nospecial.c', @@ -279,22 +299,6 @@ '-g' ], "conditions": [ - ['OS != "win"', { - 'conditions': [ - ['config=="gcov"', { - 'cflags': [ - '-ftest-coverage', - '-fprofile-arcs', - '-O0' - ], - 'ldflags': [ - '-ftest-coverage', - '-fprofile-arcs' - ] - } - ] - ] - }], ['OS == "mac"', { 'xcode_settings': { 'MACOSX_DEPLOYMENT_TARGET': '10.9', |