Revert "Revert "Reintroduce grpc#21527 (boringssl submodule unificati…

…on)"" This reverts commit cca8920.
migr1 · Jan 29, 2020 · f098606 · f098606
1 parent 637011d
commit f098606
Show file tree

Hide file tree

Showing 36 changed files with 8,132 additions and 7,085 deletions.
diff --git a/.clang_complete b/.clang_complete
@@ -6,7 +6,7 @@
 -Isrc/core/ext/upb-generated
 -Ithird_party/abseil-cpp
 -Ithird_party/benchmark/include
--Ithird_party/boringssl/include
+-Ithird_party/boringssl-with-bazel/src/include
 -Ithird_party/cares
 -Ithird_party/cares/cares
 -Ithird_party/googletest

diff --git a/.gitmodules b/.gitmodules
@@ -15,9 +15,6 @@
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest.git
-[submodule "third_party/boringssl"]
-	path = third_party/boringssl
-	url = https://github.com/google/boringssl.git
 [submodule "third_party/benchmark"]
 	path = third_party/benchmark
 	url = https://github.com/google/benchmark

diff --git a/BUILDING.md b/BUILDING.md
@@ -56,8 +56,6 @@ To prepare for cmake + Microsoft Visual C++ compiler build
 - Install Visual Studio 2015 or 2017 (Visual C++ compiler will be used).
 - Install [Git](https://git-scm.com/).
 - Install [CMake](https://cmake.org/download/).
-- Install [Active State Perl](https://www.activestate.com/activeperl/) (`choco install activeperl`) - *required by boringssl*
-- Install [Go](https://golang.org/dl/) (`choco install golang`) - *required by boringssl*
 - Install [nasm](https://www.nasm.us/) and add it to `PATH` (`choco install nasm`) - *required by boringssl*
 - (Optional) Install [Ninja](https://ninja-build.org/) (`choco install ninja`)
 

diff --git a/Makefile b/Makefile
diff --git a/PYTHON-MANIFEST.in b/PYTHON-MANIFEST.in
@@ -6,7 +6,7 @@ graft src/boringssl
 graft include/grpc
 graft third_party/abseil-cpp/absl
 graft third_party/address_sorting
-graft third_party/boringssl
+graft third_party/boringssl-with-bazel
 graft third_party/cares
 graft third_party/upb
 graft third_party/zlib

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -131,7 +131,7 @@ def grpc_deps():
             name = "boringssl",
             # NOTE: This URL generates a tarball containing dynamic date
             # information, so the sha256 is not consistent.
-            url = "https://boringssl.googlesource.com/boringssl/+archive/83da28a68f32023fd3b95a8ae94991a07b1f6c62.tar.gz",
+            url = "https://boringssl.googlesource.com/boringssl/+archive/1c2769383f027befac5b75b6cedd25daf3bf4dcf.tar.gz",
         )
 
     if "zlib" not in native.existing_rules():

diff --git a/build.yaml b/build.yaml
@@ -6286,7 +6286,7 @@ defaults:
     CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
   boringssl:
     CFLAGS: -g
-    CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
+    CPPFLAGS: -Ithird_party/boringssl-with-bazel/src/include -fvisibility=hidden -DOPENSSL_NO_ASM
       -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
     CXXFLAGS: -fno-exceptions
   global:

diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
@@ -18,7 +18,7 @@
 
 if(gRPC_SSL_PROVIDER STREQUAL "module")
   if(NOT BORINGSSL_ROOT_DIR)
-    set(BORINGSSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/boringssl)
+    set(BORINGSSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/boringssl-with-bazel)
   endif()
 
   if(EXISTS "${BORINGSSL_ROOT_DIR}/CMakeLists.txt")
@@ -40,10 +40,10 @@ if(gRPC_SSL_PROVIDER STREQUAL "module")
       endif()
     endif()
 
-    add_subdirectory(${BORINGSSL_ROOT_DIR} third_party/boringssl)
+    add_subdirectory(${BORINGSSL_ROOT_DIR} third_party/boringssl-with-bazel)
     if(TARGET ssl)
-      set(_gRPC_SSL_LIBRARIES ssl)
-      set(_gRPC_SSL_INCLUDE_DIR ${BORINGSSL_ROOT_DIR}/include)
+      set(_gRPC_SSL_LIBRARIES ssl crypto)
+      set(_gRPC_SSL_INCLUDE_DIR ${BORINGSSL_ROOT_DIR}/src/include)
       if(gRPC_INSTALL AND _gRPC_INSTALL_SUPPORTED_FROM_MODULE)
         install(TARGETS ssl crypto EXPORT gRPCTargets
           RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}

diff --git a/config.m4 b/config.m4
diff --git a/config.w32 b/config.w32
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
@@ -170,7 +170,7 @@ Pod::Spec.new do |s|
     ss.header_mappings_dir = '.'
     ss.libraries = 'z'
     ss.dependency "#{s.name}/Interface", version
-    ss.dependency 'BoringSSL-GRPC', '0.0.5'
+    ss.dependency 'BoringSSL-GRPC', '0.0.6'
     abseil_version = '0.20190808.1'
     ss.dependency 'abseil/container/inlined_vector', abseil_version
     ss.dependency 'abseil/strings/strings', abseil_version

diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/grpc.gyp b/grpc.gyp
diff --git a/package.xml b/package.xml
diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@
   CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_linux'),)
 if 'openbsd' in sys.platform:
   CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_openbsd'),)
-SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
+SSL_INCLUDE = (os.path.join('third_party', 'boringssl-with-bazel', 'src', 'include'),)
 UPB_INCLUDE = (os.path.join('third_party', 'upb'),)
 UPB_GRPC_GENERATED_INCLUDE = (os.path.join('src', 'core', 'ext', 'upb-generated'),)
 ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)

diff --git a/src/boringssl/crypto_test_data.cc b/src/boringssl/crypto_test_data.cc
diff --git a/src/boringssl/gen_build_yaml.py b/src/boringssl/gen_build_yaml.py
@@ -22,7 +22,8 @@
 sys.dont_write_bytecode = True
 
 boring_ssl_root = os.path.abspath(
-    os.path.join(os.path.dirname(sys.argv[0]), '../../third_party/boringssl'))
+    os.path.join(os.path.dirname(sys.argv[0]),
+                 '../../third_party/boringssl-with-bazel/src'))
 sys.path.append(os.path.join(boring_ssl_root, 'util'))
 
 try:
@@ -33,15 +34,13 @@
 
 
 def map_dir(filename):
-    if filename[0:4] == 'src/':
-        return 'third_party/boringssl/' + filename[4:]
-    else:
-        return 'src/boringssl/' + filename
+    return 'third_party/boringssl-with-bazel/' + filename
 
 
+# TODO(jtattermusch): is this used at all?
 def map_testarg(arg):
     if '/' in arg:
-        return 'third_party/boringssl/' + arg
+        return 'third_party/boringssl-with-bazel/src' + arg
     else:
         return arg