diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-05 17:52:01 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-05 17:52:01 +0000 |
| commit | a37ad7d1345e48dff8a60b92af384b99086f6ae6 (patch) | |
| tree | c4bc7feef08271ec06e95511c51d5f3fcc1674c8 /binding.gyp | |
| parent | 9247817082bc5d33ebe048a1aa0c5881fdb408ed (diff) | |
| parent | 0994bbd0f7d8e97ca946ee97f24643d79e5d2c3e (diff) | |
Merge branch 'trickle_stall' of github.com:ctiller/grpc into trickle_stall
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 e424d136d6..582c61282f 100644 --- a/binding.gyp +++ b/binding.gyp @@ -507,7 +507,7 @@ }, ] }], - ['OS == "win"', { + ['OS == "win" and runtime!="electron"', { 'targets': [ { # IMPORTANT WINDOWS BUILD INFORMATION @@ -518,6 +518,8 @@ # when including the Node headers. The remedy for this is to remove # the OpenSSL headers, from the downloaded Node development package, # which is typically located in `.node-gyp` in your home directory. + # + # This is not true of Electron, which does not have OpenSSL headers. 'target_name': 'WINDOWS_BUILD_WARNING', 'rules': [ { @@ -752,7 +754,7 @@ 'src/core/lib/surface/completion_queue.c', 'src/core/lib/surface/completion_queue_factory.c', 'src/core/lib/surface/event_string.c', - 'src/core/lib/surface/lame_client.c', + 'src/core/lib/surface/lame_client.cc', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', 'src/core/lib/surface/validate_metadata.c', @@ -824,6 +826,7 @@ 'src/core/tsi/fake_transport_security.c', 'src/core/tsi/ssl_transport_security.c', 'src/core/tsi/transport_security.c', + 'src/core/tsi/transport_security_adapter.c', 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/filters/client_channel/channel_connectivity.c', |