Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

Commit 39faa2a

Browse files
authored
Update Envoy to dc168055154a99d10a2b170e8da078c6e8d001f3 (#2099)
Update Envoy to dc168055154a99d10a2b170e8da078c6e8d001f3
1 parent 0f29474 commit 39faa2a

File tree

6 files changed

+47
-11
lines changed

6 files changed

+47
-11
lines changed

.bazelrc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ run --color=yes
2323

2424
build --color=yes
2525
build --workspace_status_command="bash bazel/get_workspace_status"
26+
# TODO: https://github.com/envoyproxy/envoy/issues/22758
27+
build --incompatible_use_platforms_repo_for_constraints=false
2628
build --incompatible_strict_action_env
2729
build --host_force_python=PY3
2830
build --java_runtime_version=remotejdk_11
2931
build --tool_java_runtime_version=remotejdk_11
30-
# build --platform_mappings="" # unique
32+
build --platform_mappings=bazel/platform_mappings
3133
# silence absl logspam.
3234
build --copt=-DABSL_MIN_LOG_LEVEL=4
3335

@@ -84,10 +86,8 @@ build:asan --config=sanitizer
8486
# ASAN install its signal handler, disable ours so the stacktrace will be printed by ASAN
8587
build:asan --define signal_trace=disabled
8688
build:asan --define ENVOY_CONFIG_ASAN=1
87-
# The following two lines were manually edited due to #593. # unique
88-
# Flag undefined was dropped from both the lines to allow CI/ASAN to pass. # unique
89-
build:asan --copt -fsanitize=address # unique
90-
build:asan --linkopt -fsanitize=address # unique
89+
build:asan --copt -fsanitize=address,undefined
90+
build:asan --linkopt -fsanitize=address,undefined
9191
# vptr and function sanitizer are enabled in clang-asan if it is set up via bazel/setup_clang.sh.
9292
build:asan --copt -fno-sanitize=vptr,function
9393
build:asan --linkopt -fno-sanitize=vptr,function
@@ -299,7 +299,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
299299

300300
# Docker sandbox
301301
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
302-
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
302+
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:3de483a98c5e24973e710b4f97b2dabcd3cb621f
303303
build:docker-sandbox --spawn_strategy=docker
304304
build:docker-sandbox --strategy=Javac=docker
305305
build:docker-sandbox --strategy=Closure=docker

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.0-pre.20220720.3
1+
6.0.0-pre.20220706.4

bazel/platform_mappings

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
flags:
2+
--cpu=arm64-v8a
3+
--crosstool_top=//external:android/crosstool
4+
@envoy//bazel:android_aarch64
5+
6+
--cpu=armeabi-v7a
7+
--crosstool_top=//external:android/crosstool
8+
@envoy//bazel:android_armeabi
9+
10+
--cpu=x86
11+
--crosstool_top=//external:android/crosstool
12+
@envoy//bazel:android_x86
13+
14+
--cpu=x86_64
15+
--crosstool_top=//external:android/crosstool
16+
@envoy//bazel:android_x86_64
17+
18+
--cpu=darwin_x86_64
19+
--apple_platform_type=macos
20+
@envoy//bazel:macos_x86_64
21+
22+
--cpu=darwin_arm64
23+
--apple_platform_type=macos
24+
@envoy//bazel:macos_arm64
25+
26+
--cpu=ios_x86_64
27+
--apple_platform_type=ios
28+
@envoy//bazel:ios_x86_64_platform
29+
30+
--cpu=ios_sim_arm64
31+
--apple_platform_type=ios
32+
@envoy//bazel:ios_sim_arm64_platform
33+
34+
--cpu=ios_arm64
35+
--apple_platform_type=ios
36+
@envoy//bazel:ios_arm64_platform

bazel/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ load(":aprutil.bzl", "aprutil_build_rule")
1313
load(":serf.bzl", "serf_build_rule")
1414
load(":closure_compiler.bzl", "closure_library_rules")
1515

16-
ENVOY_COMMIT = "5261b4285d1487f93e7aece94786de9a8d3a2529" # Aug 5, 2022
17-
ENVOY_SHA = "70e0485733d81ccb1076abc63114c3f3e0a17490843fc9041b0540dc27f23630"
16+
ENVOY_COMMIT = "dc168055154a99d10a2b170e8da078c6e8d001f3" # Aug 29th, 2022
17+
ENVOY_SHA = "b8cb775ffdae81b734ad9d15dce3af381facd17a28e477d0ba2837c56c2f667c"
1818

1919
BROTLI_COMMIT = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
2020
BROTLI_SHA = "ba8be5d701b369f86d14f3701c81d6bf6c6c34015c183ff98352c12ea5f5226b"

pagespeed/controller/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cc_grpc_library(
2323
proto_only = False,
2424
use_external = False,
2525
visibility = ["//visibility:public"],
26-
well_known_protos = True,
26+
well_known_protos = False,
2727
deps = [
2828
":controller_proto_cc",
2929
],

test/pagespeed/controller/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ cc_grpc_library(
4545
proto_only = False,
4646
use_external = False,
4747
visibility = ["//visibility:public"],
48-
well_known_protos = True,
48+
well_known_protos = False,
4949
deps = [
5050
":grpc_test_proto_cc",
5151
],

0 commit comments

Comments
 (0)