Merge github.com:grpc/grpc into naming-crisis

9 files changed, 351 insertions, 554 deletions

diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py
index b565fbb3f0..f84d35580b 100644
--- a/tools/run_tests/artifact_targets.py
+++ b/tools/run_tests/artifact_targets.py
@@ -79,6 +79,12 @@ def macos_arch_env(arch):
     raise Exception('Unsupported arch')
   return {'CFLAGS': arch_arg, 'LDFLAGS': arch_arg}
 
+_MACOS_COMPAT_FLAG = '-mmacosx-version-min=10.7'
+
+_ARCH_FLAG_MAP = {
+  'x86': '-m32',
+  'x64': '-m64'
+}
 
 python_version_arch_map = {
   'x86': 'Python27_32bits',
@@ -199,6 +205,7 @@ class CSharpExtArtifact:
   def __str__(self):
     return self.name
 
+
 node_gyp_arch_map = {
   'x86': 'ia32',
   'x64': 'x64'
@@ -235,10 +242,54 @@ class NodeExtArtifact:
                                self.gyp_arch])
 
 
+class ProtocArtifact:
+  """Builds protoc and protoc-plugin artifacts"""
+
+  def __init__(self, platform, arch):
+    self.name = 'protoc_%s_%s' % (platform, arch)
+    self.platform = platform
+    self.arch = arch
+    self.labels = ['artifact', 'protoc', platform, arch]
+
+  def pre_build_jobspecs(self):
+      return []
+
+  def build_jobspec(self):
+    if self.platform != 'windows':
+      cxxflags = '-DNDEBUG %s' % _ARCH_FLAG_MAP[self.arch]
+      ldflags = '%s' % _ARCH_FLAG_MAP[self.arch]
+      if self.platform != 'macos':
+        ldflags += '  -static-libgcc -static-libstdc++ -s'
+      environ={'CONFIG': 'opt',
+               'CXXFLAGS': cxxflags,
+               'LDFLAGS': ldflags,
+               'PROTOBUF_LDFLAGS_EXTRA': ldflags}
+      if self.platform == 'linux':
+        return create_docker_jobspec(self.name,
+            'tools/dockerfile/grpc_artifact_protoc',
+            'tools/run_tests/build_artifact_protoc.sh',
+            environ=environ)
+      else:
+        environ['CXXFLAGS'] += ' -std=c++11 -stdlib=libc++ %s' % _MACOS_COMPAT_FLAG
+        return create_jobspec(self.name,
+            ['tools/run_tests/build_artifact_protoc.sh'],
+            environ=environ)
+    else:
+      generator = 'Visual Studio 12 Win64' if self.arch == 'x64' else 'Visual Studio 12' 
+      vcplatform = 'x64' if self.arch == 'x64' else 'Win32'
+      return create_jobspec(self.name,
+                            ['tools\\run_tests\\build_artifact_protoc.bat'],
+                            environ={'generator': generator,
+                                     'Platform': vcplatform})
+
+  def __str__(self):
+    return self.name
+
+
 def targets():
   """Gets list of supported targets"""
   return ([Cls(platform, arch)
-           for Cls in (CSharpExtArtifact, NodeExtArtifact)
+           for Cls in (CSharpExtArtifact, NodeExtArtifact, ProtocArtifact)
            for platform in ('linux', 'macos', 'windows')
            for arch in ('x86', 'x64')] +
           [PythonArtifact('linux', 'x86'),
diff --git a/tools/run_tests/build_artifact_protoc.bat b/tools/run_tests/build_artifact_protoc.bat
new file mode 100644
index 0000000000..e1dc032188
--- /dev/null
+++ b/tools/run_tests/build_artifact_protoc.bat
@@ -0,0 +1,51 @@
+@rem Copyright 2016, Google Inc.
+@rem All rights reserved.
+@rem
+@rem Redistribution and use in source and binary forms, with or without
+@rem modification, are permitted provided that the following conditions are
+@rem met:
+@rem
+@rem     * Redistributions of source code must retain the above copyright
+@rem notice, this list of conditions and the following disclaimer.
+@rem     * Redistributions in binary form must reproduce the above
+@rem copyright notice, this list of conditions and the following disclaimer
+@rem in the documentation and/or other materials provided with the
+@rem distribution.
+@rem     * Neither the name of Google Inc. nor the names of its
+@rem contributors may be used to endorse or promote products derived from
+@rem this software without specific prior written permission.
+@rem
+@rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@rem A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@rem OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@rem SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@rem LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@rem DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+@rem THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+mkdir artifacts
+
+setlocal
+cd third_party/protobuf
+
+powershell -Command "Invoke-WebRequest https://googlemock.googlecode.com/files/gmock-1.7.0.zip -OutFile gmock.zip"
+powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::ExtractToDirectory('gmock.zip', '.');"
+rename gmock-1.7.0 gmock
+
+cd cmake
+cmake -G "%generator%" || goto :error
+endlocal
+
+call vsprojects/build_plugins.bat || goto :error
+
+xcopy /Y third_party\protobuf\cmake\Release\protoc.exe artifacts\ || goto :error
+xcopy /Y vsprojects\Release\*_plugin.exe artifacts\ || xcopy /Y vsprojects\x64\Release\*_plugin.exe artifacts\ || goto :error
+
+goto :EOF
+
+:error
+exit /b 1
\ No newline at end of file
diff --git a/tools/run_tests/build_artifact_protoc.sh b/tools/run_tests/build_artifact_protoc.sh
new file mode 100755
index 0000000000..161d3a84d6
--- /dev/null
+++ b/tools/run_tests/build_artifact_protoc.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Copyright 2016, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Use devtoolset environment that has GCC 4.7 before set -ex
+source scl_source enable devtoolset-1.1
+
+set -ex
+
+cd $(dirname $0)/../..
+
+make plugins
+
+mkdir -p artifacts
+cp bins/opt/protobuf/protoc bins/opt/*_plugin artifacts/
diff --git a/tools/run_tests/configs.json b/tools/run_tests/configs.json
index 9d7b8a3c72..cbb8ec57b6 100644
--- a/tools/run_tests/configs.json
+++ b/tools/run_tests/configs.json
@@ -18,7 +18,7 @@
     "environ": {
       "ASAN_OPTIONS": "detect_leaks=0:color=always"
     }, 
-    "timeout_multiplier": 1.5
+    "timeout_multiplier": 3
   }, 
   {
     "config": "ubsan", 
@@ -48,18 +48,18 @@
       "ASAN_OPTIONS": "detect_leaks=1:color=always", 
       "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
     }, 
-    "timeout_multiplier": 1.5
+    "timeout_multiplier": 3
   }, 
   {
     "config": "tsan", 
     "environ": {
       "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
     }, 
-    "timeout_multiplier": 2
+    "timeout_multiplier": 5
   }, 
   {
     "config": "msan", 
-    "timeout_multiplier": 2
+    "timeout_multiplier": 4
   }, 
   {
     "config": "mutrace"
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index f49230e49a..c08b382638 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -44,6 +44,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
  9f897b25800d2f54f5c442ef01a60721aeca6d87 third_party/boringssl (version_for_cocoapods_1.0-67-g9f897b2)
  05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
  c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
+ 5497a1dfc91a86965383cdd1652e348345400435 third_party/nanopb (nanopb-0.3.3-10-g5497a1d)
  d5fb408ddc281ffcadeb08699e65bb694656d0bd third_party/protobuf (v3.0.0-beta-2)
  50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF
diff --git a/tools/run_tests/sanity/check_version.py b/tools/run_tests/sanity/check_version.py
new file mode 100755
index 0000000000..41dd5efe38
--- /dev/null
+++ b/tools/run_tests/sanity/check_version.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python2.7
+
+# Copyright 2016, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import sys
+import yaml
+import os
+import re
+import subprocess
+
+errors = 0
+
+os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../..'))
+
+# hack import paths to pick up extra code
+sys.path.insert(0, os.path.abspath('tools/buildgen/plugins'))
+from expand_version import Version
+
+try:
+  branch_name = subprocess.check_output(
+    'git rev-parse --abbrev-ref HEAD',
+    shell=True)
+except:
+  print 'WARNING: not a git repository'
+  branch_name = None
+
+if branch_name is not None:
+  m = re.match(r'^release-([0-9]+)_([0-9]+)$', branch_name)
+  if m:
+    print 'RELEASE branch'
+    # version number should align with the branched version
+    check_version = lambda version: (
+      version.major == int(m.group(1)) and
+      version.minor == int(m.group(2)))
+    warning = 'Version key "%%s" value "%%s" should have a major version %s and minor version %s' % (m.group(1), m.group(2))
+  elif re.match(r'^debian/.*$', branch_name):
+    # no additional version checks for debian branches
+    check_version = lambda version: True
+  else:
+    # all other branches should have a -dev tag
+    check_version = lambda version: version.tag == 'dev'
+    warning = 'Version key "%s" value "%s" should have a -dev tag'
+else:
+  check_version = lambda version: True
+
+with open('build.yaml', 'r') as f:
+  build_yaml = yaml.load(f.read())
+
+settings = build_yaml['settings']
+
+top_version = Version(settings['version'])
+if not check_version(top_version):
+  errors += 1
+  print warning % ('version', top_version)
+
+for tag, value in settings.iteritems():
+  if re.match(r'^[a-z]+_version$', tag):
+    value = Version(value)
+    if value.major != top_version.major:
+      errors += 1
+      print 'major version mismatch on %s: %d vs %d' % (tag, value.major, top_version.major)
+    if value.minor != top_version.minor:
+      errors += 1
+      print 'minor version mismatch on %s: %d vs %d' % (tag, value.minor, top_version.minor)
+    if not check_version(value):
+      errors += 1
+      print warning % (tag, value)
+
+sys.exit(errors)
+
diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml
index 809e6ce645..cffc180fb0 100644
--- a/tools/run_tests/sanity/sanity_tests.yaml
+++ b/tools/run_tests/sanity/sanity_tests.yaml
@@ -1,9 +1,11 @@
 # a set of tests that are run in parallel for sanity tests
+- script: tools/run_tests/sanity/check_cache_mk.sh
 - script: tools/run_tests/sanity/check_sources_and_headers.py
 - script: tools/run_tests/sanity/check_submodules.sh
-- script: tools/run_tests/sanity/check_cache_mk.sh
+- script: tools/run_tests/sanity/check_version.py
 - script: tools/buildgen/generate_projects.sh -j 3
   cpu_cost: 3
 - script: tools/distrib/check_copyright.py
 - script: tools/distrib/clang_format_code.sh
 - script: tools/distrib/check_trailing_newlines.sh
+- script: tools/distrib/check_nanopb_output.sh
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 36cd19e6b2..6b70f091eb 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -1902,6 +1902,25 @@
   }, 
   {
     "deps": [
+      "grpc", 
+      "grpc++", 
+      "grpc++_test_util", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "src/proto/grpc/lb/v0/load_balancer.grpc.pb.h", 
+      "src/proto/grpc/lb/v0/load_balancer.pb.h"
+    ], 
+    "language": "c++", 
+    "name": "grpclb_api_test", 
+    "src": [
+      "test/cpp/grpclb/grpclb_api_test.cc"
+    ], 
+    "third_party": false, 
+    "type": "target"
+  }, 
+  {
+    "deps": [
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3852,6 +3871,7 @@
       "src/core/client_config/client_config.h", 
       "src/core/client_config/connector.h", 
       "src/core/client_config/initial_connect_string.h", 
+      "src/core/client_config/lb_policies/load_balancer_api.h", 
       "src/core/client_config/lb_policies/pick_first.h", 
       "src/core/client_config/lb_policies/round_robin.h", 
       "src/core/client_config/lb_policy.h", 
@@ -3912,6 +3932,7 @@
       "src/core/json/json_common.h", 
       "src/core/json/json_reader.h", 
       "src/core/json/json_writer.h", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.h", 
       "src/core/security/auth_filters.h", 
       "src/core/security/b64.h", 
       "src/core/security/credentials.h", 
@@ -3964,7 +3985,11 @@
       "src/core/tsi/ssl_transport_security.h", 
       "src/core/tsi/ssl_types.h", 
       "src/core/tsi/transport_security.h", 
-      "src/core/tsi/transport_security_interface.h"
+      "src/core/tsi/transport_security_interface.h", 
+      "third_party/nanopb/pb.h", 
+      "third_party/nanopb/pb_common.h", 
+      "third_party/nanopb/pb_decode.h", 
+      "third_party/nanopb/pb_encode.h"
     ], 
     "language": "c", 
     "name": "grpc", 
@@ -4020,6 +4045,8 @@
       "src/core/client_config/default_initial_connect_string.c", 
       "src/core/client_config/initial_connect_string.c", 
       "src/core/client_config/initial_connect_string.h", 
+      "src/core/client_config/lb_policies/load_balancer_api.c", 
+      "src/core/client_config/lb_policies/load_balancer_api.h", 
       "src/core/client_config/lb_policies/pick_first.c", 
       "src/core/client_config/lb_policies/pick_first.h", 
       "src/core/client_config/lb_policies/round_robin.c", 
@@ -4145,6 +4172,8 @@
       "src/core/json/json_string.c", 
       "src/core/json/json_writer.c", 
       "src/core/json/json_writer.h", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.c", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.h", 
       "src/core/security/auth_filters.h", 
       "src/core/security/b64.c", 
       "src/core/security/b64.h", 
@@ -4399,6 +4428,7 @@
       "src/core/client_config/client_config.h", 
       "src/core/client_config/connector.h", 
       "src/core/client_config/initial_connect_string.h", 
+      "src/core/client_config/lb_policies/load_balancer_api.h", 
       "src/core/client_config/lb_policies/pick_first.h", 
       "src/core/client_config/lb_policies/round_robin.h", 
       "src/core/client_config/lb_policy.h", 
@@ -4459,6 +4489,7 @@
       "src/core/json/json_common.h", 
       "src/core/json/json_reader.h", 
       "src/core/json/json_writer.h", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.h", 
       "src/core/statistics/census_interface.h", 
       "src/core/statistics/census_rpc_stats.h", 
       "src/core/surface/api_trace.h", 
@@ -4497,7 +4528,11 @@
       "src/core/transport/metadata_batch.h", 
       "src/core/transport/static_metadata.h", 
       "src/core/transport/transport.h", 
-      "src/core/transport/transport_impl.h"
+      "src/core/transport/transport_impl.h", 
+      "third_party/nanopb/pb.h", 
+      "third_party/nanopb/pb_common.h", 
+      "third_party/nanopb/pb_decode.h", 
+      "third_party/nanopb/pb_encode.h"
     ], 
     "language": "c", 
     "name": "grpc_unsecure", 
@@ -4552,6 +4587,8 @@
       "src/core/client_config/default_initial_connect_string.c", 
       "src/core/client_config/initial_connect_string.c", 
       "src/core/client_config/initial_connect_string.h", 
+      "src/core/client_config/lb_policies/load_balancer_api.c", 
+      "src/core/client_config/lb_policies/load_balancer_api.h", 
       "src/core/client_config/lb_policies/pick_first.c", 
       "src/core/client_config/lb_policies/pick_first.h", 
       "src/core/client_config/lb_policies/round_robin.c", 
@@ -4676,6 +4713,8 @@
       "src/core/json/json_string.c", 
       "src/core/json/json_writer.c", 
       "src/core/json/json_writer.h", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.c", 
+      "src/core/proto/grpc/lb/v0/load_balancer.pb.h", 
       "src/core/statistics/census_interface.h", 
       "src/core/statistics/census_rpc_stats.h", 
       "src/core/surface/alarm.c", 
@@ -5723,407 +5762,7 @@
     "language": "c", 
     "name": "boringssl", 
     "src": [
-      "src/boringssl/err_data.c", 
-      "third_party/boringssl/crypto/aes/aes.c", 
-      "third_party/boringssl/crypto/aes/internal.h", 
-      "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_bytes.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_locl.h", 
-      "third_party/boringssl/crypto/asn1/asn1_par.c", 
-      "third_party/boringssl/crypto/asn1/asn_pack.c", 
-      "third_party/boringssl/crypto/asn1/bio_asn1.c", 
-      "third_party/boringssl/crypto/asn1/bio_ndef.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/t_pkey.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_prn.c", 
-      "third_party/boringssl/crypto/asn1/tasn_typ.c", 
-      "third_party/boringssl/crypto/asn1/tasn_utl.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/buffer.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/internal.h", 
-      "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/internal.h", 
-      "third_party/boringssl/crypto/bn/kronecker.c", 
-      "third_party/boringssl/crypto/bn/montgomery.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/rsaz_exp.h", 
-      "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/ber.c", 
-      "third_party/boringssl/crypto/bytestring/cbb.c", 
-      "third_party/boringssl/crypto/bytestring/cbs.c", 
-      "third_party/boringssl/crypto/bytestring/internal.h", 
-      "third_party/boringssl/crypto/chacha/chacha_generic.c", 
-      "third_party/boringssl/crypto/chacha/chacha_vec.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/internal.h", 
-      "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/conf/conf_def.h", 
-      "third_party/boringssl/crypto/conf/internal.h", 
-      "third_party/boringssl/crypto/cpu-arm.c", 
-      "third_party/boringssl/crypto/cpu-intel.c", 
-      "third_party/boringssl/crypto/crypto.c", 
-      "third_party/boringssl/crypto/curve25519/curve25519.c", 
-      "third_party/boringssl/crypto/des/des.c", 
-      "third_party/boringssl/crypto/des/internal.h", 
-      "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/internal.h", 
-      "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/internal.h", 
-      "third_party/boringssl/crypto/digest/md32_common.h", 
-      "third_party/boringssl/crypto/directory.h", 
-      "third_party/boringssl/crypto/directory_posix.c", 
-      "third_party/boringssl/crypto/directory_win.c", 
-      "third_party/boringssl/crypto/dsa/dsa.c", 
-      "third_party/boringssl/crypto/dsa/dsa_asn1.c", 
-      "third_party/boringssl/crypto/dsa/internal.h", 
-      "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/internal.h", 
-      "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-table.h", 
-      "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/algorithm.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/internal.h", 
-      "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/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/internal.h", 
-      "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/internal.h", 
-      "third_party/boringssl/crypto/modes/ofb.c", 
-      "third_party/boringssl/crypto/obj/obj.c", 
-      "third_party/boringssl/crypto/obj/obj_dat.h", 
-      "third_party/boringssl/crypto/obj/obj_xref.c", 
-      "third_party/boringssl/crypto/obj/obj_xref.h", 
-      "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/internal.h", 
-      "third_party/boringssl/crypto/pkcs8/p5_pbe.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/rand/internal.h", 
-      "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/internal.h", 
-      "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.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/test/scoped_types.h", 
-      "third_party/boringssl/crypto/test/test_util.h", 
-      "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/time_support.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/asn1_gen.c", 
-      "third_party/boringssl/crypto/x509/by_dir.c", 
-      "third_party/boringssl/crypto/x509/by_file.c", 
-      "third_party/boringssl/crypto/x509/charmap.h", 
-      "third_party/boringssl/crypto/x509/i2d_pr.c", 
-      "third_party/boringssl/crypto/x509/pkcs7.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/vpm_int.h", 
-      "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/ext_dat.h", 
-      "third_party/boringssl/crypto/x509v3/pcy_cache.c", 
-      "third_party/boringssl/crypto/x509v3/pcy_data.c", 
-      "third_party/boringssl/crypto/x509v3/pcy_int.h", 
-      "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/include/openssl/aead.h", 
-      "third_party/boringssl/include/openssl/aes.h", 
-      "third_party/boringssl/include/openssl/arm_arch.h", 
-      "third_party/boringssl/include/openssl/asn1.h", 
-      "third_party/boringssl/include/openssl/asn1_mac.h", 
-      "third_party/boringssl/include/openssl/asn1t.h", 
-      "third_party/boringssl/include/openssl/base.h", 
-      "third_party/boringssl/include/openssl/base64.h", 
-      "third_party/boringssl/include/openssl/bio.h", 
-      "third_party/boringssl/include/openssl/blowfish.h", 
-      "third_party/boringssl/include/openssl/bn.h", 
-      "third_party/boringssl/include/openssl/buf.h", 
-      "third_party/boringssl/include/openssl/buffer.h", 
-      "third_party/boringssl/include/openssl/bytestring.h", 
-      "third_party/boringssl/include/openssl/cast.h", 
-      "third_party/boringssl/include/openssl/chacha.h", 
-      "third_party/boringssl/include/openssl/cipher.h", 
-      "third_party/boringssl/include/openssl/cmac.h", 
-      "third_party/boringssl/include/openssl/conf.h", 
-      "third_party/boringssl/include/openssl/cpu.h", 
-      "third_party/boringssl/include/openssl/crypto.h", 
-      "third_party/boringssl/include/openssl/curve25519.h", 
-      "third_party/boringssl/include/openssl/des.h", 
-      "third_party/boringssl/include/openssl/dh.h", 
-      "third_party/boringssl/include/openssl/digest.h", 
-      "third_party/boringssl/include/openssl/dsa.h", 
-      "third_party/boringssl/include/openssl/dtls1.h", 
-      "third_party/boringssl/include/openssl/ec.h", 
-      "third_party/boringssl/include/openssl/ec_key.h", 
-      "third_party/boringssl/include/openssl/ecdh.h", 
-      "third_party/boringssl/include/openssl/ecdsa.h", 
-      "third_party/boringssl/include/openssl/engine.h", 
-      "third_party/boringssl/include/openssl/err.h", 
-      "third_party/boringssl/include/openssl/evp.h", 
-      "third_party/boringssl/include/openssl/ex_data.h", 
-      "third_party/boringssl/include/openssl/hkdf.h", 
-      "third_party/boringssl/include/openssl/hmac.h", 
-      "third_party/boringssl/include/openssl/lhash.h", 
-      "third_party/boringssl/include/openssl/lhash_macros.h", 
-      "third_party/boringssl/include/openssl/md4.h", 
-      "third_party/boringssl/include/openssl/md5.h", 
-      "third_party/boringssl/include/openssl/mem.h", 
-      "third_party/boringssl/include/openssl/obj.h", 
-      "third_party/boringssl/include/openssl/obj_mac.h", 
-      "third_party/boringssl/include/openssl/objects.h", 
-      "third_party/boringssl/include/openssl/opensslfeatures.h", 
-      "third_party/boringssl/include/openssl/opensslv.h", 
-      "third_party/boringssl/include/openssl/ossl_typ.h", 
-      "third_party/boringssl/include/openssl/pem.h", 
-      "third_party/boringssl/include/openssl/pkcs12.h", 
-      "third_party/boringssl/include/openssl/pkcs7.h", 
-      "third_party/boringssl/include/openssl/pkcs8.h", 
-      "third_party/boringssl/include/openssl/poly1305.h", 
-      "third_party/boringssl/include/openssl/pqueue.h", 
-      "third_party/boringssl/include/openssl/rand.h", 
-      "third_party/boringssl/include/openssl/rc4.h", 
-      "third_party/boringssl/include/openssl/rsa.h", 
-      "third_party/boringssl/include/openssl/safestack.h", 
-      "third_party/boringssl/include/openssl/sha.h", 
-      "third_party/boringssl/include/openssl/srtp.h", 
-      "third_party/boringssl/include/openssl/ssl.h", 
-      "third_party/boringssl/include/openssl/ssl3.h", 
-      "third_party/boringssl/include/openssl/stack.h", 
-      "third_party/boringssl/include/openssl/stack_macros.h", 
-      "third_party/boringssl/include/openssl/thread.h", 
-      "third_party/boringssl/include/openssl/time_support.h", 
-      "third_party/boringssl/include/openssl/tls1.h", 
-      "third_party/boringssl/include/openssl/type_check.h", 
-      "third_party/boringssl/include/openssl/x509.h", 
-      "third_party/boringssl/include/openssl/x509_vfy.h", 
-      "third_party/boringssl/include/openssl/x509v3.h", 
-      "third_party/boringssl/ssl/custom_extensions.c", 
-      "third_party/boringssl/ssl/d1_both.c", 
-      "third_party/boringssl/ssl/d1_clnt.c", 
-      "third_party/boringssl/ssl/d1_lib.c", 
-      "third_party/boringssl/ssl/d1_meth.c", 
-      "third_party/boringssl/ssl/d1_pkt.c", 
-      "third_party/boringssl/ssl/d1_srtp.c", 
-      "third_party/boringssl/ssl/d1_srvr.c", 
-      "third_party/boringssl/ssl/dtls_record.c", 
-      "third_party/boringssl/ssl/internal.h", 
-      "third_party/boringssl/ssl/pqueue/pqueue.c", 
-      "third_party/boringssl/ssl/s3_both.c", 
-      "third_party/boringssl/ssl/s3_clnt.c", 
-      "third_party/boringssl/ssl/s3_enc.c", 
-      "third_party/boringssl/ssl/s3_lib.c", 
-      "third_party/boringssl/ssl/s3_meth.c", 
-      "third_party/boringssl/ssl/s3_pkt.c", 
-      "third_party/boringssl/ssl/s3_srvr.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_file.c", 
-      "third_party/boringssl/ssl/ssl_lib.c", 
-      "third_party/boringssl/ssl/ssl_rsa.c", 
-      "third_party/boringssl/ssl/ssl_session.c", 
-      "third_party/boringssl/ssl/ssl_stat.c", 
-      "third_party/boringssl/ssl/t1_enc.c", 
-      "third_party/boringssl/ssl/t1_lib.c", 
-      "third_party/boringssl/ssl/test/async_bio.h", 
-      "third_party/boringssl/ssl/test/packeted_bio.h", 
-      "third_party/boringssl/ssl/test/scoped_types.h", 
-      "third_party/boringssl/ssl/test/test_config.h", 
-      "third_party/boringssl/ssl/tls_record.c"
+      "src/boringssl/err_data.c"
     ], 
     "third_party": true, 
     "type": "lib"
@@ -6133,11 +5772,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_test_util", 
-    "src": [
-      "third_party/boringssl/crypto/test/file_test.cc", 
-      "third_party/boringssl/crypto/test/malloc.cc", 
-      "third_party/boringssl/crypto/test/test_util.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6149,9 +5784,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_aes_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/aes/aes_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6163,9 +5796,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_base64_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/base64/base64_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6177,9 +5808,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_bio_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/bio/bio_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6191,9 +5820,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_bn_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/bn/bn_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6205,9 +5832,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_bytestring_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/bytestring/bytestring_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6219,9 +5844,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_aead_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/cipher/aead_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6233,9 +5856,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_cipher_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/cipher/cipher_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6247,9 +5868,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_cmac_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/cmac/cmac_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6261,9 +5880,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_constant_time_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/constant_time_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6275,9 +5892,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_ed25519_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/curve25519/ed25519_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6289,9 +5904,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_x25519_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/curve25519/x25519_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6303,9 +5916,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_dh_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/dh/dh_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6317,9 +5928,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_digest_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/digest/digest_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6331,9 +5940,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_dsa_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/dsa/dsa_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6345,9 +5952,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_ec_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/ec/ec_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6359,9 +5964,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_example_mul_lib", 
-    "src": [
-      "third_party/boringssl/crypto/ec/example_mul.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6373,9 +5976,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_ecdsa_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/ecdsa/ecdsa_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6387,9 +5988,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_err_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/err/err_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6401,9 +6000,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_evp_extra_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/evp/evp_extra_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6415,9 +6012,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_evp_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/evp/evp_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6429,9 +6024,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_pbkdf_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/evp/pbkdf_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6443,9 +6036,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_hkdf_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/hkdf/hkdf_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6457,9 +6048,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_hmac_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/hmac/hmac_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6471,9 +6060,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_lhash_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/lhash/lhash_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6485,9 +6072,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_gcm_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/modes/gcm_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6499,9 +6084,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_pkcs12_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/pkcs8/pkcs12_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6513,9 +6096,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_pkcs8_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/pkcs8/pkcs8_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6527,9 +6108,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_poly1305_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/poly1305/poly1305_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6541,9 +6120,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_refcount_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/refcount_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6555,9 +6132,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_rsa_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/rsa/rsa_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6569,9 +6144,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_thread_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/thread_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6583,9 +6156,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_pkcs7_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/x509/pkcs7_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6597,9 +6168,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_tab_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/x509v3/tab_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6611,9 +6180,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_v3name_test_lib", 
-    "src": [
-      "third_party/boringssl/crypto/x509v3/v3name_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6625,9 +6192,7 @@
     "headers": [], 
     "language": "c", 
     "name": "boringssl_pqueue_test_lib", 
-    "src": [
-      "third_party/boringssl/ssl/pqueue/pqueue_test.c"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6639,9 +6204,7 @@
     "headers": [], 
     "language": "c++", 
     "name": "boringssl_ssl_test_lib", 
-    "src": [
-      "third_party/boringssl/ssl/ssl_test.cc"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
@@ -6662,34 +6225,7 @@
     ], 
     "language": "c", 
     "name": "z", 
-    "src": [
-      "third_party/zlib/adler32.c", 
-      "third_party/zlib/compress.c", 
-      "third_party/zlib/crc32.c", 
-      "third_party/zlib/crc32.h", 
-      "third_party/zlib/deflate.c", 
-      "third_party/zlib/deflate.h", 
-      "third_party/zlib/gzclose.c", 
-      "third_party/zlib/gzguts.h", 
-      "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/inffast.h", 
-      "third_party/zlib/inffixed.h", 
-      "third_party/zlib/inflate.c", 
-      "third_party/zlib/inflate.h", 
-      "third_party/zlib/inftrees.c", 
-      "third_party/zlib/inftrees.h", 
-      "third_party/zlib/trees.c", 
-      "third_party/zlib/trees.h", 
-      "third_party/zlib/uncompr.c", 
-      "third_party/zlib/zconf.h", 
-      "third_party/zlib/zlib.h", 
-      "third_party/zlib/zutil.c", 
-      "third_party/zlib/zutil.h"
-    ], 
+    "src": [], 
     "third_party": true, 
     "type": "lib"
   }, 
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 0bc14917d4..742005c43e 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -2051,6 +2051,26 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c++", 
+    "name": "grpclb_api_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "args": [], 
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "cpu_cost": 1.0, 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c++", 
     "name": "hybrid_end2end_test", 
     "platforms": [
       "linux", 
@@ -2104,7 +2124,7 @@
       "mac", 
       "posix"
     ], 
-    "cpu_cost": 1.0, 
+    "cpu_cost": 10, 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c++", 
@@ -2123,9 +2143,7 @@
       "posix"
     ], 
     "cpu_cost": 10, 
-    "exclude_configs": [
-      "tsan"
-    ], 
+    "exclude_configs": [], 
     "flaky": false, 
     "language": "c++", 
     "name": "qps_test",