diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-04-25 10:54:21 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-04-25 10:54:21 -0700 |
| commit | 178ebc92ba865bfcde10f5d06a49112db0f2e363 (patch) | |
| tree | f0f092f27ba45669912918c4b33e1a1b2b91fe25 /binding.gyp | |
| parent | e5c485d47d742600a61b2f6ac0bd47bfa762bb5c (diff) | |
| parent | bf2315cbdfa70d6abf7d3f012c5cb3dce6aa36ff (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/binding.gyp b/binding.gyp index 53d86534de..058743edbf 100644 --- a/binding.gyp +++ b/binding.gyp @@ -223,6 +223,7 @@ 'third_party/boringssl/crypto/bn/shift.c', 'third_party/boringssl/crypto/bn/sqrt.c', 'third_party/boringssl/crypto/buf/buf.c', + 'third_party/boringssl/crypto/bytestring/asn1_compat.c', 'third_party/boringssl/crypto/bytestring/ber.c', 'third_party/boringssl/crypto/bytestring/cbb.c', 'third_party/boringssl/crypto/bytestring/cbs.c', @@ -246,6 +247,7 @@ 'third_party/boringssl/crypto/cpu-intel.c', 'third_party/boringssl/crypto/crypto.c', 'third_party/boringssl/crypto/curve25519/curve25519.c', + 'third_party/boringssl/crypto/curve25519/x25519-x86_64.c', 'third_party/boringssl/crypto/des/des.c', 'third_party/boringssl/crypto/dh/check.c', 'third_party/boringssl/crypto/dh/dh.c', @@ -437,6 +439,7 @@ 'third_party/boringssl/ssl/ssl_buffer.c', 'third_party/boringssl/ssl/ssl_cert.c', 'third_party/boringssl/ssl/ssl_cipher.c', + 'third_party/boringssl/ssl/ssl_ecdh.c', 'third_party/boringssl/ssl/ssl_file.c', 'third_party/boringssl/ssl/ssl_lib.c', 'third_party/boringssl/ssl/ssl_rsa.c', @@ -558,6 +561,7 @@ 'gpr', ], 'sources': [ + 'src/core/lib/surface/init.c', 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', 'src/core/lib/channel/channel_stack_builder.c', @@ -627,7 +631,6 @@ 'src/core/lib/surface/channel_stack_type.c', 'src/core/lib/surface/completion_queue.c', 'src/core/lib/surface/event_string.c', - 'src/core/lib/surface/init.c', 'src/core/lib/surface/lame_client.c', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', |