diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-13 15:22:38 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-13 15:22:38 +0000 |
| commit | cacaa1950dc7c788ac589c434ae75845771c96a9 (patch) | |
| tree | d43b412e0eda1e743ca17bbb6a1555a678adf61b /binding.gyp | |
| parent | fb75b8d4290cf8d54fc304a4b37b54b3354d3ac2 (diff) | |
| parent | 4d0ee2a56b71b3eae4865c6440362daebba0b5f7 (diff) | |
Merge github.com:grpc/grpc into epex3
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index c1a9f733ea..8847fe8134 100644 --- a/binding.gyp +++ b/binding.gyp @@ -519,9 +519,10 @@ # the OpenSSL headers, from the downloaded Node development package, # which is typically located in `.node-gyp` in your home directory. 'target_name': 'WINDOWS_BUILD_WARNING', - 'actions': [ + 'rules': [ { - 'action_name': 'WINDOWS_BUILD_WARNING', + 'rule_name': 'WINDOWS_BUILD_WARNING', + 'extension': 'S', 'inputs': [ 'package.json' ], @@ -789,6 +790,7 @@ 'src/core/ext/transport/chttp2/transport/hpack_encoder.c', 'src/core/ext/transport/chttp2/transport/hpack_parser.c', 'src/core/ext/transport/chttp2/transport/hpack_table.c', + 'src/core/ext/transport/chttp2/transport/http2_settings.c', 'src/core/ext/transport/chttp2/transport/huffsyms.c', 'src/core/ext/transport/chttp2/transport/incoming_metadata.c', 'src/core/ext/transport/chttp2/transport/parsing.c', |