Regenerated grpc.gyp with grrpc/third_party dependencies.
diff --git a/grpc.gyp b/grpc.gyp
index 505f464..78b0364 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -446,6 +446,9 @@
         'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c',
         'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.c',
         'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c',
@@ -1109,6 +1112,9 @@
         'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.c',
         'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c',
         'src/core/ext/census/base_resources.c',
@@ -1383,6 +1389,7 @@
       ],
       'sources': [
         'src/compiler/cpp_generator.cc',
+        'src/compiler/csharp_generator.cc',
         'src/compiler/node_generator.cc',
         'src/compiler/objective_c_generator.cc',
         'src/compiler/php_generator.cc',
@@ -1526,11 +1533,788 @@
       ],
     },
     {
+      'target_name': 'boringssl',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      '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',
+        'third_party/boringssl/crypto/asn1/a_dup.c',
+        'third_party/boringssl/crypto/asn1/a_enum.c',
+        'third_party/boringssl/crypto/asn1/a_gentm.c',
+        'third_party/boringssl/crypto/asn1/a_i2d_fp.c',
+        'third_party/boringssl/crypto/asn1/a_int.c',
+        'third_party/boringssl/crypto/asn1/a_mbstr.c',
+        'third_party/boringssl/crypto/asn1/a_object.c',
+        'third_party/boringssl/crypto/asn1/a_octet.c',
+        'third_party/boringssl/crypto/asn1/a_print.c',
+        'third_party/boringssl/crypto/asn1/a_strnid.c',
+        'third_party/boringssl/crypto/asn1/a_time.c',
+        'third_party/boringssl/crypto/asn1/a_type.c',
+        'third_party/boringssl/crypto/asn1/a_utctm.c',
+        'third_party/boringssl/crypto/asn1/a_utf8.c',
+        'third_party/boringssl/crypto/asn1/asn1_lib.c',
+        'third_party/boringssl/crypto/asn1/asn1_par.c',
+        'third_party/boringssl/crypto/asn1/asn_pack.c',
+        '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',
+        'third_party/boringssl/crypto/asn1/tasn_new.c',
+        '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',
+        'third_party/boringssl/crypto/bio/connect.c',
+        'third_party/boringssl/crypto/bio/fd.c',
+        'third_party/boringssl/crypto/bio/file.c',
+        'third_party/boringssl/crypto/bio/hexdump.c',
+        'third_party/boringssl/crypto/bio/pair.c',
+        '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/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/cmac/cmac.c',
+        'third_party/boringssl/crypto/conf/conf.c',
+        'third_party/boringssl/crypto/cpu-aarch64-linux.c',
+        'third_party/boringssl/crypto/cpu-arm-linux.c',
+        'third_party/boringssl/crypto/cpu-arm.c',
+        'third_party/boringssl/crypto/cpu-intel.c',
+        'third_party/boringssl/crypto/cpu-ppc64le.c',
+        'third_party/boringssl/crypto/crypto.c',
+        '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/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/ecdh/ecdh.c',
+        'third_party/boringssl/crypto/ecdsa/ecdsa.c',
+        'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c',
+        'third_party/boringssl/crypto/engine/engine.c',
+        'third_party/boringssl/crypto/err/err.c',
+        'third_party/boringssl/crypto/evp/digestsign.c',
+        'third_party/boringssl/crypto/evp/evp.c',
+        'third_party/boringssl/crypto/evp/evp_asn1.c',
+        'third_party/boringssl/crypto/evp/evp_ctx.c',
+        '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_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/sign.c',
+        'third_party/boringssl/crypto/ex_data.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',
+        'third_party/boringssl/crypto/pem/pem_info.c',
+        'third_party/boringssl/crypto/pem/pem_lib.c',
+        'third_party/boringssl/crypto/pem/pem_oth.c',
+        'third_party/boringssl/crypto/pem/pem_pk8.c',
+        '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/pkcs8/p5_pbev2.c',
+        'third_party/boringssl/crypto/pkcs8/p8_pkey.c',
+        'third_party/boringssl/crypto/pkcs8/pkcs8.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/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/stack/stack.c',
+        'third_party/boringssl/crypto/thread.c',
+        'third_party/boringssl/crypto/thread_none.c',
+        'third_party/boringssl/crypto/thread_pthread.c',
+        'third_party/boringssl/crypto/thread_win.c',
+        'third_party/boringssl/crypto/x509/a_digest.c',
+        'third_party/boringssl/crypto/x509/a_sign.c',
+        'third_party/boringssl/crypto/x509/a_strex.c',
+        'third_party/boringssl/crypto/x509/a_verify.c',
+        'third_party/boringssl/crypto/x509/algorithm.c',
+        'third_party/boringssl/crypto/x509/asn1_gen.c',
+        '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',
+        'third_party/boringssl/crypto/x509/t_x509.c',
+        'third_party/boringssl/crypto/x509/t_x509a.c',
+        'third_party/boringssl/crypto/x509/x509.c',
+        'third_party/boringssl/crypto/x509/x509_att.c',
+        'third_party/boringssl/crypto/x509/x509_cmp.c',
+        'third_party/boringssl/crypto/x509/x509_d2.c',
+        'third_party/boringssl/crypto/x509/x509_def.c',
+        'third_party/boringssl/crypto/x509/x509_ext.c',
+        'third_party/boringssl/crypto/x509/x509_lu.c',
+        'third_party/boringssl/crypto/x509/x509_obj.c',
+        'third_party/boringssl/crypto/x509/x509_r2x.c',
+        'third_party/boringssl/crypto/x509/x509_req.c',
+        'third_party/boringssl/crypto/x509/x509_set.c',
+        'third_party/boringssl/crypto/x509/x509_trs.c',
+        'third_party/boringssl/crypto/x509/x509_txt.c',
+        'third_party/boringssl/crypto/x509/x509_v3.c',
+        'third_party/boringssl/crypto/x509/x509_vfy.c',
+        'third_party/boringssl/crypto/x509/x509_vpm.c',
+        'third_party/boringssl/crypto/x509/x509cset.c',
+        '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',
+        'third_party/boringssl/crypto/x509/x_crl.c',
+        'third_party/boringssl/crypto/x509/x_exten.c',
+        'third_party/boringssl/crypto/x509/x_info.c',
+        'third_party/boringssl/crypto/x509/x_name.c',
+        'third_party/boringssl/crypto/x509/x_pkey.c',
+        'third_party/boringssl/crypto/x509/x_pubkey.c',
+        'third_party/boringssl/crypto/x509/x_req.c',
+        'third_party/boringssl/crypto/x509/x_sig.c',
+        'third_party/boringssl/crypto/x509/x_spki.c',
+        'third_party/boringssl/crypto/x509/x_val.c',
+        'third_party/boringssl/crypto/x509/x_x509.c',
+        'third_party/boringssl/crypto/x509/x_x509a.c',
+        'third_party/boringssl/crypto/x509v3/pcy_cache.c',
+        'third_party/boringssl/crypto/x509v3/pcy_data.c',
+        'third_party/boringssl/crypto/x509v3/pcy_lib.c',
+        'third_party/boringssl/crypto/x509v3/pcy_map.c',
+        'third_party/boringssl/crypto/x509v3/pcy_node.c',
+        'third_party/boringssl/crypto/x509v3/pcy_tree.c',
+        'third_party/boringssl/crypto/x509v3/v3_akey.c',
+        'third_party/boringssl/crypto/x509v3/v3_akeya.c',
+        'third_party/boringssl/crypto/x509v3/v3_alt.c',
+        'third_party/boringssl/crypto/x509v3/v3_bcons.c',
+        'third_party/boringssl/crypto/x509v3/v3_bitst.c',
+        'third_party/boringssl/crypto/x509v3/v3_conf.c',
+        'third_party/boringssl/crypto/x509v3/v3_cpols.c',
+        'third_party/boringssl/crypto/x509v3/v3_crld.c',
+        'third_party/boringssl/crypto/x509v3/v3_enum.c',
+        'third_party/boringssl/crypto/x509v3/v3_extku.c',
+        'third_party/boringssl/crypto/x509v3/v3_genn.c',
+        'third_party/boringssl/crypto/x509v3/v3_ia5.c',
+        'third_party/boringssl/crypto/x509v3/v3_info.c',
+        'third_party/boringssl/crypto/x509v3/v3_int.c',
+        'third_party/boringssl/crypto/x509v3/v3_lib.c',
+        'third_party/boringssl/crypto/x509v3/v3_ncons.c',
+        'third_party/boringssl/crypto/x509v3/v3_pci.c',
+        'third_party/boringssl/crypto/x509v3/v3_pcia.c',
+        'third_party/boringssl/crypto/x509v3/v3_pcons.c',
+        'third_party/boringssl/crypto/x509v3/v3_pku.c',
+        'third_party/boringssl/crypto/x509v3/v3_pmaps.c',
+        'third_party/boringssl/crypto/x509v3/v3_prn.c',
+        'third_party/boringssl/crypto/x509v3/v3_purp.c',
+        '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',
+      ],
+    },
+    {
+      'target_name': 'boringssl_test_util',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/test/file_test.cc',
+        'third_party/boringssl/crypto/test/malloc.cc',
+        'third_party/boringssl/crypto/test/test_util.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_aes_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/aes/aes_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_asn1_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/asn1/asn1_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_base64_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/base64/base64_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_bio_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/bio/bio_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_bn_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/bn/bn_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_bytestring_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/bytestring/bytestring_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_aead_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/cipher/aead_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_cipher_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/cipher/cipher_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_cmac_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/cmac/cmac_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_constant_time_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/constant_time_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ed25519_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/curve25519/ed25519_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_spake25519_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/curve25519/spake25519_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_x25519_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/curve25519/x25519_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_digest_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/digest/digest_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_example_mul_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ec/example_mul.c',
+      ],
+    },
+    {
+      'target_name': 'boringssl_p256-x86_64_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ec/p256-x86_64_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdh_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ecdh/ecdh_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdsa_sign_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ecdsa/ecdsa_sign_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdsa_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ecdsa/ecdsa_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_ecdsa_verify_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/ecdsa/ecdsa_verify_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_evp_extra_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/evp/evp_extra_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_evp_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/evp/evp_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_pbkdf_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/evp/pbkdf_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_hkdf_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/hkdf/hkdf_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_hmac_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/hmac/hmac_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_lhash_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/lhash/lhash_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_gcm_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/modes/gcm_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_obj_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/obj/obj_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_pkcs12_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/pkcs8/pkcs12_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_pkcs8_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/pkcs8/pkcs8_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_poly1305_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/poly1305/poly1305_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_pool_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/pool/pool_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_refcount_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/refcount_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_thread_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/thread_test.c',
+      ],
+    },
+    {
+      'target_name': 'boringssl_pkcs7_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/x509/pkcs7_test.c',
+      ],
+    },
+    {
+      'target_name': 'boringssl_x509_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/x509/x509_test.cc',
+      ],
+    },
+    {
+      'target_name': 'boringssl_tab_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/x509v3/tab_test.c',
+      ],
+    },
+    {
+      'target_name': 'boringssl_v3name_test_lib',
+      'type': 'static_library',
+      'dependencies': [
+        'boringssl_test_util',
+        'boringssl',
+      ],
+      'sources': [
+        'third_party/boringssl/crypto/x509v3/v3name_test.c',
+      ],
+    },
+    {
       'target_name': 'benchmark',
       'type': 'static_library',
       'dependencies': [
       ],
       'sources': [
+        'third_party/benchmark/src/benchmark.cc',
+        'third_party/benchmark/src/benchmark_register.cc',
+        'third_party/benchmark/src/colorprint.cc',
+        'third_party/benchmark/src/commandlineflags.cc',
+        'third_party/benchmark/src/complexity.cc',
+        'third_party/benchmark/src/console_reporter.cc',
+        'third_party/benchmark/src/csv_reporter.cc',
+        'third_party/benchmark/src/json_reporter.cc',
+        'third_party/benchmark/src/reporter.cc',
+        'third_party/benchmark/src/sleep.cc',
+        'third_party/benchmark/src/string_util.cc',
+        'third_party/benchmark/src/sysinfo.cc',
+        'third_party/benchmark/src/timers.cc',
+      ],
+    },
+    {
+      'target_name': 'z',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      'sources': [
+        'third_party/zlib/adler32.c',
+        'third_party/zlib/compress.c',
+        'third_party/zlib/crc32.c',
+        'third_party/zlib/deflate.c',
+        'third_party/zlib/gzclose.c',
+        'third_party/zlib/gzlib.c',
+        'third_party/zlib/gzread.c',
+        'third_party/zlib/gzwrite.c',
+        'third_party/zlib/infback.c',
+        'third_party/zlib/inffast.c',
+        'third_party/zlib/inflate.c',
+        'third_party/zlib/inftrees.c',
+        'third_party/zlib/trees.c',
+        'third_party/zlib/uncompr.c',
+        'third_party/zlib/zutil.c',
       ],
     },
     {