diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index de5f7a127a85e..68f01cd348694 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -174,6 +174,7 @@ def envoy_dependencies(path = "@envoy_deps//", skip_targets = []): # The long repo names (`com_github_fmtlib_fmt` instead of `fmtlib`) are # semi-standard in the Bazel community, intended to avoid both duplicate # dependencies and name conflicts. + _boringssl() _com_google_absl() _com_github_bombela_backward() _com_github_cyan4973_xxhash() @@ -197,6 +198,13 @@ def envoy_dependencies(path = "@envoy_deps//", skip_targets = []): _go_deps(skip_targets) _envoy_api_deps() +def _boringssl(): + _repository_impl("boringssl") + native.bind( + name = "ssl", + actual = "@boringssl//:ssl", + ) + def _com_github_bombela_backward(): _repository_impl( name = "com_github_bombela_backward", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c40a7ecb5bd4c..c250c98ab29a0 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1,4 +1,9 @@ REPOSITORY_LOCATIONS = dict( + boringssl = dict( + # Use commits from branch "chromium-stable-with-bazel" + commit = "426db8db7d1cbd17573e295b52d7aab7a97ba1ff", # chromium-64.0.3282.119 + remote = "https://boringssl.googlesource.com/boringssl", + ), com_google_absl = dict( commit = "787891a3882795cee0364e8a0f0dda315578d155", remote = "https://github.com/abseil/abseil-cpp", diff --git a/bazel/target_recipes.bzl b/bazel/target_recipes.bzl index 0fafdd7d6b435..002780148a4e2 100644 --- a/bazel/target_recipes.bzl +++ b/bazel/target_recipes.bzl @@ -9,7 +9,6 @@ TARGET_RECIPES = { "tcmalloc_and_profiler": "gperftools", "luajit": "luajit", "nghttp2": "nghttp2", - "ssl": "boringssl", "yaml_cpp": "yaml-cpp", "zlib": "zlib", } diff --git a/ci/build_container/build_recipes/boringssl.sh b/ci/build_container/build_recipes/boringssl.sh deleted file mode 100755 index 944d9bb680b58..0000000000000 --- a/ci/build_container/build_recipes/boringssl.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -COMMIT=a20bb7ff8bb5057065a2e7941249773f9676cf45 # chromium-64.0.3282.119 - -git clone https://boringssl.googlesource.com/boringssl -cd boringssl -git reset --hard "$COMMIT" -cmake -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${CPPFLAGS}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS} ${CPPFLAGS}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo . -make VERBOSE=1 -cp -r include/* "$THIRDPARTY_BUILD"/include -cp ssl/libssl.a "$THIRDPARTY_BUILD"/lib -cp crypto/libcrypto.a "$THIRDPARTY_BUILD"/lib diff --git a/ci/prebuilt/BUILD b/ci/prebuilt/BUILD index cc62498a9053e..691644568905c 100644 --- a/ci/prebuilt/BUILD +++ b/ci/prebuilt/BUILD @@ -16,13 +16,6 @@ cc_library( includes = ["thirdparty_build/include"], ) -cc_library( - name = "crypto", - srcs = ["thirdparty_build/lib/libcrypto.a"], - hdrs = glob(["thirdparty_build/include/openssl/**/*.h"]), - includes = ["thirdparty_build/include"], -) - cc_library( name = "event", srcs = ["thirdparty_build/lib/libevent.a"], @@ -52,12 +45,6 @@ cc_library( includes = ["thirdparty_build/include"], ) -cc_library( - name = "ssl", - srcs = ["thirdparty_build/lib/libssl.a"], - deps = [":crypto"], -) - cc_library( name = "tcmalloc_and_profiler", srcs = ["thirdparty_build/lib/libtcmalloc_and_profiler.a"],