Skip to content

Commit 0630ea2

Browse files
committed
Added @bssl-compat//:utests-boringssl target
Also some tidy-ups Signed-off-by: Ted Poole <tpoole@redhat.com>
1 parent 101882d commit 0630ea2

File tree

146 files changed

+705
-696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+705
-696
lines changed

.github/workflows/envoy-openssl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.3.23
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727
- run: |
28-
./ci/run_envoy_docker.sh './ci/do_ci.sh gcc @bssl-compat//:utests-bssl-compat //test/...'
28+
./ci/run_envoy_docker.sh './ci/do_ci.sh gcc @bssl-compat//test/... //test/...'
2929
env:
3030
BAZEL_BUILD_EXTRA_OPTIONS: >-
3131
--config=remote-envoy-engflow

bazel/boringssl-bssl-compat.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,23 @@ diff --git a/BUILD.bazel b/BUILD.bazel
22
index b7dc359..cd87639 100644
33
--- a/BUILD.bazel
44
+++ b/BUILD.bazel
5-
@@ -66,6 +66,11 @@ license(
5+
@@ -66,6 +66,20 @@ license(
66

77
exports_files(["LICENSE"])
88

99
+# Export additional files for bssl-compat layer
1010
+exports_files(glob(["include/**/*"]))
1111
+exports_files(glob(["crypto/**/*"]))
1212
+exports_files(glob(["ssl/**/*"]))
13+
+
14+
+filegroup(
15+
+ name = "test_data",
16+
+ srcs = glob([
17+
+ "crypto/x509/test/*.pem",
18+
+ "crypto/pkcs8/test/*.p12",
19+
+ ]),
20+
+ visibility = ["//visibility:public"],
21+
+)
1322
+
1423
bssl_cc_library(
1524
name = "crypto",

bazel/envoy_build_system.bzl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ def _envoy_directory_genrule_impl(ctx):
9696
tools = ctx.files.tools,
9797
outputs = [tree],
9898
command = "mkdir -p " + tree.path + " && " + ctx.expand_location(ctx.attr.cmd),
99-
env = {
100-
"GENRULE_OUTPUT_DIR": tree.path,
101-
"LD_LIBRARY_PATH": ":".join([f.dirname for f in ctx.files._openssl_libs]),
102-
},
99+
env = {"GENRULE_OUTPUT_DIR": tree.path},
103100
use_default_shell_env = True,
104101
toolchain = None,
105102
)

0 commit comments

Comments
 (0)