Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing

1 files changed, 236 insertions, 168 deletions

diff --git a/grpc.gyp b/grpc.gyp
index bab351a123..4c5dc8b9e3 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -164,8 +164,6 @@
         'src/core/lib/gpr/alloc.cc',
         'src/core/lib/gpr/arena.cc',
         'src/core/lib/gpr/atm.cc',
-        'src/core/lib/gpr/avl.cc',
-        'src/core/lib/gpr/cmdline.cc',
         'src/core/lib/gpr/cpu_iphone.cc',
         'src/core/lib/gpr/cpu_linux.cc',
         'src/core/lib/gpr/cpu_posix.cc',
@@ -186,8 +184,6 @@
         'src/core/lib/gpr/string_posix.cc',
         'src/core/lib/gpr/string_util_windows.cc',
         'src/core/lib/gpr/string_windows.cc',
-        'src/core/lib/gpr/subprocess_posix.cc',
-        'src/core/lib/gpr/subprocess_windows.cc',
         'src/core/lib/gpr/sync.cc',
         'src/core/lib/gpr/sync_posix.cc',
         'src/core/lib/gpr/sync_windows.cc',
@@ -225,6 +221,7 @@
       ],
       'sources': [
         'src/core/lib/surface/init.cc',
+        'src/core/lib/avl/avl.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
@@ -237,7 +234,6 @@
         'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/compression_ruby.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
         'src/core/lib/compression/stream_compression_gzip.cc',
@@ -330,7 +326,6 @@
         'src/core/lib/slice/slice_hash_table.cc',
         'src/core/lib/slice/slice_intern.cc',
         'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/alarm.cc',
         'src/core/lib/surface/api_trace.cc',
         'src/core/lib/surface/byte_buffer.cc',
         'src/core/lib/surface/byte_buffer_reader.cc',
@@ -438,7 +433,6 @@
         'src/core/ext/filters/client_channel/proxy_mapper.cc',
         'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
         'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_factory.cc',
         'src/core/ext/filters/client_channel/resolver_registry.cc',
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
@@ -522,8 +516,12 @@
         'test/core/util/port_isolated_runtime_environment.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
+        'test/core/util/subprocess_posix.cc',
+        'test/core/util/subprocess_windows.cc',
         'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
+        'test/core/util/cmdline.cc',
+        'src/core/lib/avl/avl.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
@@ -536,7 +534,6 @@
         'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/compression_ruby.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
         'src/core/lib/compression/stream_compression_gzip.cc',
@@ -629,7 +626,6 @@
         'src/core/lib/slice/slice_hash_table.cc',
         'src/core/lib/slice/slice_intern.cc',
         'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/alarm.cc',
         'src/core/lib/surface/api_trace.cc',
         'src/core/lib/surface/byte_buffer.cc',
         'src/core/lib/surface/byte_buffer_reader.cc',
@@ -677,7 +673,6 @@
         'src/core/ext/filters/client_channel/proxy_mapper.cc',
         'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
         'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_factory.cc',
         'src/core/ext/filters/client_channel/resolver_registry.cc',
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
@@ -739,8 +734,12 @@
         'test/core/util/port_isolated_runtime_environment.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
+        'test/core/util/subprocess_posix.cc',
+        'test/core/util/subprocess_windows.cc',
         'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
+        'test/core/util/cmdline.cc',
+        'src/core/lib/avl/avl.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
@@ -753,7 +752,6 @@
         'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/compression_ruby.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
         'src/core/lib/compression/stream_compression_gzip.cc',
@@ -846,7 +844,6 @@
         'src/core/lib/slice/slice_hash_table.cc',
         'src/core/lib/slice/slice_intern.cc',
         'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/alarm.cc',
         'src/core/lib/surface/api_trace.cc',
         'src/core/lib/surface/byte_buffer.cc',
         'src/core/lib/surface/byte_buffer_reader.cc',
@@ -894,7 +891,6 @@
         'src/core/ext/filters/client_channel/proxy_mapper.cc',
         'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
         'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_factory.cc',
         'src/core/ext/filters/client_channel/resolver_registry.cc',
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
@@ -939,6 +935,7 @@
       'sources': [
         'src/core/lib/surface/init.cc',
         'src/core/lib/surface/init_unsecure.cc',
+        'src/core/lib/avl/avl.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
@@ -951,7 +948,6 @@
         'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/compression_ruby.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
         'src/core/lib/compression/stream_compression_gzip.cc',
@@ -1044,7 +1040,6 @@
         'src/core/lib/slice/slice_hash_table.cc',
         'src/core/lib/slice/slice_intern.cc',
         'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/alarm.cc',
         'src/core/lib/surface/api_trace.cc',
         'src/core/lib/surface/byte_buffer.cc',
         'src/core/lib/surface/byte_buffer_reader.cc',
@@ -1125,7 +1120,6 @@
         'src/core/ext/filters/client_channel/proxy_mapper.cc',
         'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
         'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_factory.cc',
         'src/core/ext/filters/client_channel/resolver_registry.cc',
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
@@ -1213,6 +1207,7 @@
         'src/cpp/client/create_channel_posix.cc',
         'src/cpp/client/credentials_cc.cc',
         'src/cpp/client/generic_stub.cc',
+        'src/cpp/common/alarm.cc',
         'src/cpp/common/channel_arguments.cc',
         'src/cpp/common/channel_filter.cc',
         'src/cpp/common/completion_queue_cc.cc',
@@ -1358,6 +1353,7 @@
         'src/cpp/client/create_channel_posix.cc',
         'src/cpp/client/credentials_cc.cc',
         'src/cpp/client/generic_stub.cc',
+        'src/cpp/common/alarm.cc',
         'src/cpp/common/channel_arguments.cc',
         'src/cpp/common/channel_filter.cc',
         'src/cpp/common/completion_queue_cc.cc',
@@ -1575,9 +1571,6 @@
       ],
       'sources': [
         'src/boringssl/err_data.c',
-        'third_party/boringssl/crypto/aes/aes.c',
-        'third_party/boringssl/crypto/aes/key_wrap.c',
-        'third_party/boringssl/crypto/aes/mode_wrappers.c',
         'third_party/boringssl/crypto/asn1/a_bitstr.c',
         'third_party/boringssl/crypto/asn1/a_bool.c',
         'third_party/boringssl/crypto/asn1/a_d2i_fp.c',
@@ -1601,7 +1594,6 @@
         'third_party/boringssl/crypto/asn1/f_enum.c',
         'third_party/boringssl/crypto/asn1/f_int.c',
         'third_party/boringssl/crypto/asn1/f_string.c',
-        'third_party/boringssl/crypto/asn1/t_bitst.c',
         'third_party/boringssl/crypto/asn1/tasn_dec.c',
         'third_party/boringssl/crypto/asn1/tasn_enc.c',
         'third_party/boringssl/crypto/asn1/tasn_fre.c',
@@ -1609,8 +1601,6 @@
         'third_party/boringssl/crypto/asn1/tasn_typ.c',
         'third_party/boringssl/crypto/asn1/tasn_utl.c',
         'third_party/boringssl/crypto/asn1/time_support.c',
-        'third_party/boringssl/crypto/asn1/x_bignum.c',
-        'third_party/boringssl/crypto/asn1/x_long.c',
         'third_party/boringssl/crypto/base64/base64.c',
         'third_party/boringssl/crypto/bio/bio.c',
         'third_party/boringssl/crypto/bio/bio_mem.c',
@@ -1622,44 +1612,25 @@
         'third_party/boringssl/crypto/bio/printf.c',
         'third_party/boringssl/crypto/bio/socket.c',
         'third_party/boringssl/crypto/bio/socket_helper.c',
-        'third_party/boringssl/crypto/bn/add.c',
-        'third_party/boringssl/crypto/bn/asm/x86_64-gcc.c',
-        'third_party/boringssl/crypto/bn/bn.c',
-        'third_party/boringssl/crypto/bn/bn_asn1.c',
-        'third_party/boringssl/crypto/bn/cmp.c',
-        'third_party/boringssl/crypto/bn/convert.c',
-        'third_party/boringssl/crypto/bn/ctx.c',
-        'third_party/boringssl/crypto/bn/div.c',
-        'third_party/boringssl/crypto/bn/exponentiation.c',
-        'third_party/boringssl/crypto/bn/gcd.c',
-        'third_party/boringssl/crypto/bn/generic.c',
-        'third_party/boringssl/crypto/bn/kronecker.c',
-        'third_party/boringssl/crypto/bn/montgomery.c',
-        'third_party/boringssl/crypto/bn/montgomery_inv.c',
-        'third_party/boringssl/crypto/bn/mul.c',
-        'third_party/boringssl/crypto/bn/prime.c',
-        'third_party/boringssl/crypto/bn/random.c',
-        'third_party/boringssl/crypto/bn/rsaz_exp.c',
-        'third_party/boringssl/crypto/bn/shift.c',
-        'third_party/boringssl/crypto/bn/sqrt.c',
+        'third_party/boringssl/crypto/bn_extra/bn_asn1.c',
+        'third_party/boringssl/crypto/bn_extra/convert.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',
         'third_party/boringssl/crypto/chacha/chacha.c',
-        'third_party/boringssl/crypto/cipher/aead.c',
-        'third_party/boringssl/crypto/cipher/cipher.c',
-        'third_party/boringssl/crypto/cipher/derive_key.c',
-        'third_party/boringssl/crypto/cipher/e_aes.c',
-        'third_party/boringssl/crypto/cipher/e_chacha20poly1305.c',
-        'third_party/boringssl/crypto/cipher/e_des.c',
-        'third_party/boringssl/crypto/cipher/e_null.c',
-        'third_party/boringssl/crypto/cipher/e_rc2.c',
-        'third_party/boringssl/crypto/cipher/e_rc4.c',
-        'third_party/boringssl/crypto/cipher/e_ssl3.c',
-        'third_party/boringssl/crypto/cipher/e_tls.c',
-        'third_party/boringssl/crypto/cipher/tls_cbc.c',
+        'third_party/boringssl/crypto/cipher_extra/cipher_extra.c',
+        'third_party/boringssl/crypto/cipher_extra/derive_key.c',
+        'third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c',
+        'third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c',
+        'third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c',
+        'third_party/boringssl/crypto/cipher_extra/e_null.c',
+        'third_party/boringssl/crypto/cipher_extra/e_rc2.c',
+        'third_party/boringssl/crypto/cipher_extra/e_rc4.c',
+        'third_party/boringssl/crypto/cipher_extra/e_ssl3.c',
+        'third_party/boringssl/crypto/cipher_extra/e_tls.c',
+        'third_party/boringssl/crypto/cipher_extra/tls_cbc.c',
         'third_party/boringssl/crypto/cmac/cmac.c',
         'third_party/boringssl/crypto/conf/conf.c',
         'third_party/boringssl/crypto/cpu-aarch64-linux.c',
@@ -1671,29 +1642,16 @@
         'third_party/boringssl/crypto/curve25519/curve25519.c',
         'third_party/boringssl/crypto/curve25519/spake25519.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',
         'third_party/boringssl/crypto/dh/dh_asn1.c',
         'third_party/boringssl/crypto/dh/params.c',
-        'third_party/boringssl/crypto/digest/digest.c',
-        'third_party/boringssl/crypto/digest/digests.c',
+        'third_party/boringssl/crypto/digest_extra/digest_extra.c',
         'third_party/boringssl/crypto/dsa/dsa.c',
         'third_party/boringssl/crypto/dsa/dsa_asn1.c',
-        'third_party/boringssl/crypto/ec/ec.c',
-        'third_party/boringssl/crypto/ec/ec_asn1.c',
-        'third_party/boringssl/crypto/ec/ec_key.c',
-        'third_party/boringssl/crypto/ec/ec_montgomery.c',
-        'third_party/boringssl/crypto/ec/oct.c',
-        'third_party/boringssl/crypto/ec/p224-64.c',
-        'third_party/boringssl/crypto/ec/p256-64.c',
-        'third_party/boringssl/crypto/ec/p256-x86_64.c',
-        'third_party/boringssl/crypto/ec/simple.c',
-        'third_party/boringssl/crypto/ec/util-64.c',
-        'third_party/boringssl/crypto/ec/wnaf.c',
+        'third_party/boringssl/crypto/ec_extra/ec_asn1.c',
         'third_party/boringssl/crypto/ecdh/ecdh.c',
-        'third_party/boringssl/crypto/ecdsa/ecdsa.c',
-        'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c',
+        'third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c',
         'third_party/boringssl/crypto/engine/engine.c',
         'third_party/boringssl/crypto/err/err.c',
         'third_party/boringssl/crypto/evp/digestsign.c',
@@ -1703,24 +1661,20 @@
         'third_party/boringssl/crypto/evp/p_dsa_asn1.c',
         'third_party/boringssl/crypto/evp/p_ec.c',
         'third_party/boringssl/crypto/evp/p_ec_asn1.c',
+        'third_party/boringssl/crypto/evp/p_ed25519.c',
+        'third_party/boringssl/crypto/evp/p_ed25519_asn1.c',
         'third_party/boringssl/crypto/evp/p_rsa.c',
         'third_party/boringssl/crypto/evp/p_rsa_asn1.c',
         'third_party/boringssl/crypto/evp/pbkdf.c',
         'third_party/boringssl/crypto/evp/print.c',
+        'third_party/boringssl/crypto/evp/scrypt.c',
         'third_party/boringssl/crypto/evp/sign.c',
         'third_party/boringssl/crypto/ex_data.c',
+        'third_party/boringssl/crypto/fipsmodule/bcm.c',
+        'third_party/boringssl/crypto/fipsmodule/is_fips.c',
         'third_party/boringssl/crypto/hkdf/hkdf.c',
-        'third_party/boringssl/crypto/hmac/hmac.c',
         'third_party/boringssl/crypto/lhash/lhash.c',
-        'third_party/boringssl/crypto/md4/md4.c',
-        'third_party/boringssl/crypto/md5/md5.c',
         'third_party/boringssl/crypto/mem.c',
-        'third_party/boringssl/crypto/modes/cbc.c',
-        'third_party/boringssl/crypto/modes/cfb.c',
-        'third_party/boringssl/crypto/modes/ctr.c',
-        'third_party/boringssl/crypto/modes/gcm.c',
-        'third_party/boringssl/crypto/modes/ofb.c',
-        'third_party/boringssl/crypto/modes/polyval.c',
         'third_party/boringssl/crypto/obj/obj.c',
         'third_party/boringssl/crypto/obj/obj_xref.c',
         'third_party/boringssl/crypto/pem/pem_all.c',
@@ -1731,30 +1685,24 @@
         'third_party/boringssl/crypto/pem/pem_pkey.c',
         'third_party/boringssl/crypto/pem/pem_x509.c',
         'third_party/boringssl/crypto/pem/pem_xaux.c',
+        'third_party/boringssl/crypto/pkcs7/pkcs7.c',
+        'third_party/boringssl/crypto/pkcs7/pkcs7_x509.c',
         'third_party/boringssl/crypto/pkcs8/p5_pbev2.c',
-        'third_party/boringssl/crypto/pkcs8/p8_pkey.c',
         'third_party/boringssl/crypto/pkcs8/pkcs8.c',
+        'third_party/boringssl/crypto/pkcs8/pkcs8_x509.c',
         'third_party/boringssl/crypto/poly1305/poly1305.c',
         'third_party/boringssl/crypto/poly1305/poly1305_arm.c',
         'third_party/boringssl/crypto/poly1305/poly1305_vec.c',
         'third_party/boringssl/crypto/pool/pool.c',
-        'third_party/boringssl/crypto/rand/deterministic.c',
-        'third_party/boringssl/crypto/rand/fuchsia.c',
-        'third_party/boringssl/crypto/rand/rand.c',
-        'third_party/boringssl/crypto/rand/urandom.c',
-        'third_party/boringssl/crypto/rand/windows.c',
+        'third_party/boringssl/crypto/rand_extra/deterministic.c',
+        'third_party/boringssl/crypto/rand_extra/forkunsafe.c',
+        'third_party/boringssl/crypto/rand_extra/fuchsia.c',
+        'third_party/boringssl/crypto/rand_extra/rand_extra.c',
+        'third_party/boringssl/crypto/rand_extra/windows.c',
         'third_party/boringssl/crypto/rc4/rc4.c',
         'third_party/boringssl/crypto/refcount_c11.c',
         'third_party/boringssl/crypto/refcount_lock.c',
-        'third_party/boringssl/crypto/rsa/blinding.c',
-        'third_party/boringssl/crypto/rsa/padding.c',
-        'third_party/boringssl/crypto/rsa/rsa.c',
-        'third_party/boringssl/crypto/rsa/rsa_asn1.c',
-        'third_party/boringssl/crypto/rsa/rsa_impl.c',
-        'third_party/boringssl/crypto/sha/sha1-altivec.c',
-        'third_party/boringssl/crypto/sha/sha1.c',
-        'third_party/boringssl/crypto/sha/sha256.c',
-        'third_party/boringssl/crypto/sha/sha512.c',
+        'third_party/boringssl/crypto/rsa_extra/rsa_asn1.c',
         'third_party/boringssl/crypto/stack/stack.c',
         'third_party/boringssl/crypto/thread.c',
         'third_party/boringssl/crypto/thread_none.c',
@@ -1769,7 +1717,6 @@
         'third_party/boringssl/crypto/x509/by_dir.c',
         'third_party/boringssl/crypto/x509/by_file.c',
         'third_party/boringssl/crypto/x509/i2d_pr.c',
-        'third_party/boringssl/crypto/x509/pkcs7.c',
         'third_party/boringssl/crypto/x509/rsa_pss.c',
         'third_party/boringssl/crypto/x509/t_crl.c',
         'third_party/boringssl/crypto/x509/t_req.c',
@@ -1795,7 +1742,6 @@
         'third_party/boringssl/crypto/x509/x509name.c',
         'third_party/boringssl/crypto/x509/x509rset.c',
         'third_party/boringssl/crypto/x509/x509spki.c',
-        'third_party/boringssl/crypto/x509/x509type.c',
         'third_party/boringssl/crypto/x509/x_algor.c',
         'third_party/boringssl/crypto/x509/x_all.c',
         'third_party/boringssl/crypto/x509/x_attrib.c',
@@ -1843,41 +1789,42 @@
         'third_party/boringssl/crypto/x509v3/v3_skey.c',
         'third_party/boringssl/crypto/x509v3/v3_sxnet.c',
         'third_party/boringssl/crypto/x509v3/v3_utl.c',
-        'third_party/boringssl/ssl/bio_ssl.c',
-        'third_party/boringssl/ssl/custom_extensions.c',
-        'third_party/boringssl/ssl/d1_both.c',
-        'third_party/boringssl/ssl/d1_lib.c',
-        'third_party/boringssl/ssl/d1_pkt.c',
-        'third_party/boringssl/ssl/d1_srtp.c',
-        'third_party/boringssl/ssl/dtls_method.c',
-        'third_party/boringssl/ssl/dtls_record.c',
-        'third_party/boringssl/ssl/handshake_client.c',
-        'third_party/boringssl/ssl/handshake_server.c',
-        'third_party/boringssl/ssl/s3_both.c',
-        'third_party/boringssl/ssl/s3_lib.c',
-        'third_party/boringssl/ssl/s3_pkt.c',
-        'third_party/boringssl/ssl/ssl_aead_ctx.c',
-        'third_party/boringssl/ssl/ssl_asn1.c',
-        '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_privkey.c',
-        'third_party/boringssl/ssl/ssl_privkey_cc.cc',
-        'third_party/boringssl/ssl/ssl_session.c',
-        'third_party/boringssl/ssl/ssl_stat.c',
-        'third_party/boringssl/ssl/ssl_transcript.c',
-        'third_party/boringssl/ssl/ssl_x509.c',
-        'third_party/boringssl/ssl/t1_enc.c',
-        'third_party/boringssl/ssl/t1_lib.c',
-        'third_party/boringssl/ssl/tls13_both.c',
-        'third_party/boringssl/ssl/tls13_client.c',
-        'third_party/boringssl/ssl/tls13_enc.c',
-        'third_party/boringssl/ssl/tls13_server.c',
-        'third_party/boringssl/ssl/tls_method.c',
-        'third_party/boringssl/ssl/tls_record.c',
+        'third_party/boringssl/ssl/bio_ssl.cc',
+        'third_party/boringssl/ssl/custom_extensions.cc',
+        'third_party/boringssl/ssl/d1_both.cc',
+        'third_party/boringssl/ssl/d1_lib.cc',
+        'third_party/boringssl/ssl/d1_pkt.cc',
+        'third_party/boringssl/ssl/d1_srtp.cc',
+        'third_party/boringssl/ssl/dtls_method.cc',
+        'third_party/boringssl/ssl/dtls_record.cc',
+        'third_party/boringssl/ssl/handshake.cc',
+        'third_party/boringssl/ssl/handshake_client.cc',
+        'third_party/boringssl/ssl/handshake_server.cc',
+        'third_party/boringssl/ssl/s3_both.cc',
+        'third_party/boringssl/ssl/s3_lib.cc',
+        'third_party/boringssl/ssl/s3_pkt.cc',
+        'third_party/boringssl/ssl/ssl_aead_ctx.cc',
+        'third_party/boringssl/ssl/ssl_asn1.cc',
+        'third_party/boringssl/ssl/ssl_buffer.cc',
+        'third_party/boringssl/ssl/ssl_cert.cc',
+        'third_party/boringssl/ssl/ssl_cipher.cc',
+        'third_party/boringssl/ssl/ssl_file.cc',
+        'third_party/boringssl/ssl/ssl_key_share.cc',
+        'third_party/boringssl/ssl/ssl_lib.cc',
+        'third_party/boringssl/ssl/ssl_privkey.cc',
+        'third_party/boringssl/ssl/ssl_session.cc',
+        'third_party/boringssl/ssl/ssl_stat.cc',
+        'third_party/boringssl/ssl/ssl_transcript.cc',
+        'third_party/boringssl/ssl/ssl_versions.cc',
+        'third_party/boringssl/ssl/ssl_x509.cc',
+        'third_party/boringssl/ssl/t1_enc.cc',
+        'third_party/boringssl/ssl/t1_lib.cc',
+        'third_party/boringssl/ssl/tls13_both.cc',
+        'third_party/boringssl/ssl/tls13_client.cc',
+        'third_party/boringssl/ssl/tls13_enc.cc',
+        'third_party/boringssl/ssl/tls13_server.cc',
+        'third_party/boringssl/ssl/tls_method.cc',
+        'third_party/boringssl/ssl/tls_record.cc',
       ],
     },
     {
@@ -1892,14 +1839,14 @@
       ],
     },
     {
-      'target_name': 'boringssl_aes_test_lib',
+      'target_name': 'boringssl_crypto_test_data_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/aes/aes_test.cc',
+        'src/boringssl/crypto_test_data.cc',
       ],
     },
     {
@@ -1936,25 +1883,25 @@
       ],
     },
     {
-      'target_name': 'boringssl_bn_test_lib',
+      'target_name': 'boringssl_bytestring_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/bn/bn_test.cc',
+        'third_party/boringssl/crypto/bytestring/bytestring_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_bytestring_test_lib',
+      'target_name': 'boringssl_chacha_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/bytestring/bytestring_test.cc',
+        'third_party/boringssl/crypto/chacha/chacha_test.cc',
       ],
     },
     {
@@ -1965,7 +1912,7 @@
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/cipher/aead_test.cc',
+        'third_party/boringssl/crypto/cipher_extra/aead_test.cc',
       ],
     },
     {
@@ -1976,7 +1923,7 @@
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/cipher/cipher_test.cc',
+        'third_party/boringssl/crypto/cipher_extra/cipher_test.cc',
       ],
     },
     {
@@ -1991,6 +1938,17 @@
       ],
     },
     {
+      'target_name': 'boringssl_compiler_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/compiler_test.cc',
+      ],
+    },
+    {
       'target_name': 'boringssl_constant_time_test_lib',
       'type': 'static_library',
       'dependencies': [
@@ -2035,36 +1993,36 @@
       ],
     },
     {
-      'target_name': 'boringssl_digest_test_lib',
+      'target_name': 'boringssl_dh_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/digest/digest_test.cc',
+        'third_party/boringssl/crypto/dh/dh_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_example_mul_lib',
+      'target_name': 'boringssl_digest_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/ec/example_mul.c',
+        'third_party/boringssl/crypto/digest_extra/digest_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_p256-x86_64_test_lib',
+      'target_name': 'boringssl_dsa_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/ec/p256-x86_64_test.cc',
+        'third_party/boringssl/crypto/dsa/dsa_test.cc',
       ],
     },
     {
@@ -2079,69 +2037,135 @@
       ],
     },
     {
-      'target_name': 'boringssl_ecdsa_sign_test_lib',
+      'target_name': 'boringssl_err_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_sign_test.cc',
+        'third_party/boringssl/crypto/err/err_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_ecdsa_test_lib',
+      'target_name': 'boringssl_evp_extra_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_test.cc',
+        'third_party/boringssl/crypto/evp/evp_extra_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_ecdsa_verify_test_lib',
+      'target_name': 'boringssl_evp_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/ecdsa/ecdsa_verify_test.cc',
+        'third_party/boringssl/crypto/evp/evp_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_evp_extra_test_lib',
+      'target_name': 'boringssl_pbkdf_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/evp/evp_extra_test.cc',
+        'third_party/boringssl/crypto/evp/pbkdf_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_evp_test_lib',
+      'target_name': 'boringssl_scrypt_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/evp/evp_test.cc',
+        'third_party/boringssl/crypto/evp/scrypt_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_pbkdf_test_lib',
+      'target_name': 'boringssl_aes_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/evp/pbkdf_test.cc',
+        'third_party/boringssl/crypto/fipsmodule/aes/aes_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_bn_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/bn/bn_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ec_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ec/ec_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_p256-x86_64_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdsa_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_gcm_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/modes/gcm_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ctrdrbg_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg_test.cc',
       ],
     },
     {
@@ -2163,7 +2187,7 @@
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/hmac/hmac_test.cc',
+        'third_party/boringssl/crypto/hmac_extra/hmac_test.cc',
       ],
     },
     {
@@ -2178,25 +2202,25 @@
       ],
     },
     {
-      'target_name': 'boringssl_gcm_test_lib',
+      'target_name': 'boringssl_obj_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/modes/gcm_test.cc',
+        'third_party/boringssl/crypto/obj/obj_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_obj_test_lib',
+      'target_name': 'boringssl_pkcs7_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/obj/obj_test.cc',
+        'third_party/boringssl/crypto/pkcs7/pkcs7_test.cc',
       ],
     },
     {
@@ -2255,25 +2279,47 @@
       ],
     },
     {
-      'target_name': 'boringssl_thread_test_lib',
+      'target_name': 'boringssl_rsa_test_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/thread_test.c',
+        'third_party/boringssl/crypto/rsa_extra/rsa_test.cc',
       ],
     },
     {
-      'target_name': 'boringssl_pkcs7_test_lib',
+      'target_name': 'boringssl_file_test_gtest_lib',
       'type': 'static_library',
       'dependencies': [
         'boringssl_test_util',
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/x509/pkcs7_test.c',
+        'third_party/boringssl/crypto/test/file_test_gtest.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_gtest_main_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/test/gtest_main.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_thread_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/thread_test.cc',
       ],
     },
     {
@@ -2295,7 +2341,7 @@
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/x509v3/tab_test.c',
+        'third_party/boringssl/crypto/x509v3/tab_test.cc',
       ],
     },
     {
@@ -2306,7 +2352,29 @@
         'boringssl',
       ],
       'sources': [
-        'third_party/boringssl/crypto/x509v3/v3name_test.c',
+        'third_party/boringssl/crypto/x509v3/v3name_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_span_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/ssl/span_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ssl_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/ssl/ssl_test.cc',
       ],
     },
     {