test

Signed-off-by: Jonh Wendell <[email protected]>

Author: jwendell

bazel/external/openssl.BUILD

@@ -1,12 +1,12 @@
 load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make")
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library")
+#load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library")
 
 licenses(["notice"])  # Apache 2
 
 filegroup(
     name = "all",
     srcs = glob(["**"]),
-    visibility = ["//visibility:public"],
+    #visibility = ["//visibility:public"],
 )
 
 configure_make(
@@ -20,22 +20,40 @@ configure_make(
     out_static_libs = ["libssl.a", "libcrypto.a"],
     out_shared_libs = ["libssl.so.3", "libssl.so", "libcrypto.so.3", "libcrypto.so"],
     out_include_dir = "include",
-)
-
-envoy_cc_library(
-    name = "ssl",
-    deps = [":openssl"],
-    repository = "@envoy",
-    rbe_pool = "6gig",
     visibility = ["//visibility:public"],
-    srcs = [":openssl"],
 )
 
-envoy_cc_library(
-    name = "crypto",
+# filegroup(
+#     name = "libs",
+#     srcs = [":openssl"],
+#     visibility = ["//visibility:public"],
+# )
+
+cc_library(
+    name = "libs",
     deps = [":openssl"],
-    repository = "@envoy",
-    rbe_pool = "6gig",
     visibility = ["//visibility:public"],
     srcs = [":openssl"],
+    data = [":openssl"],
+    alwayslink = True,
 )
+
+# envoy_cc_library(
+#     name = "libs",
+#     deps = [":openssl"],
+#     repository = "@envoy",
+#     rbe_pool = "6gig",
+#     visibility = ["//visibility:public"],
+#     srcs = [":openssl"],
+#     data = [":openssl"],
+#     alwayslink = True,
+# )
+
+# envoy_cc_library(
+#     name = "crypto",
+#     deps = [":openssl"],
+#     repository = "@envoy",
+#     rbe_pool = "6gig",
+#     visibility = ["//visibility:public"],
+#     srcs = [":openssl"],
+# )

bssl-compat/BUILD

@@ -15,8 +15,11 @@ cmake(
     visibility = ["//visibility:public"],
     generate_crosstool_file = False,
 
+    cache_entries = {"CMAKE_BUILD_TYPE": "Bazel"},
+    generate_args = ["-GNinja"],
+
     build_args = [ "-j" ],
-    deps = ["@openssl//:ssl"],
+    deps = ["@openssl//:libs"],
 )
 
 alias(

ci/do_ci.sh

@@ -203,6 +203,7 @@ function bazel_binary_build() {
   [[ -n "${ENVOY_RBE}" ]] && rm -rf bazel-bin/"${ENVOY_BIN}"*
 
   bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_TARGET}" "${CONFIG_ARGS[@]}"
+  echo "envoy --version output: $(bazel-bin/"${ENVOY_BIN}" --version)"
   collect_build_profile "${BINARY_TYPE}"_build
 
   # Copy the built envoy binary somewhere that we can access outside of the

test/common/router/BUILD

@@ -259,7 +259,7 @@ envoy_directory_genrule(
         # This is deliberately in srcs, since we run into host/target confusion
         # otherwise in oss-fuzz builds.
         ":config_impl_test_static",
-        "@openssl//:ssl",
+        "@openssl//:openssl",
     ],
     cmd = " ".join([
         "$(location corpus_from_config_impl_sh)",