Update Envoy to dc168055154a99d10a2b170e8da078c6e8d001f3 (#2099)
Update Envoy to dc168055154a99d10a2b170e8da078c6e8d001f3
diff --git a/.bazelrc b/.bazelrc
index db615b6..75ba1c1 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -23,11 +23,13 @@
build --color=yes
build --workspace_status_command="bash bazel/get_workspace_status"
+# TODO: https://github.com/envoyproxy/envoy/issues/22758
+build --incompatible_use_platforms_repo_for_constraints=false
build --incompatible_strict_action_env
build --host_force_python=PY3
build --java_runtime_version=remotejdk_11
build --tool_java_runtime_version=remotejdk_11
-# build --platform_mappings="" # unique
+build --platform_mappings=bazel/platform_mappings
# silence absl logspam.
build --copt=-DABSL_MIN_LOG_LEVEL=4
@@ -84,10 +86,8 @@
# ASAN install its signal handler, disable ours so the stacktrace will be printed by ASAN
build:asan --define signal_trace=disabled
build:asan --define ENVOY_CONFIG_ASAN=1
-# The following two lines were manually edited due to #593. # unique
-# Flag undefined was dropped from both the lines to allow CI/ASAN to pass. # unique
-build:asan --copt -fsanitize=address # unique
-build:asan --linkopt -fsanitize=address # unique
+build:asan --copt -fsanitize=address,undefined
+build:asan --linkopt -fsanitize=address,undefined
# vptr and function sanitizer are enabled in clang-asan if it is set up via bazel/setup_clang.sh.
build:asan --copt -fno-sanitize=vptr,function
build:asan --linkopt -fno-sanitize=vptr,function
@@ -299,7 +299,7 @@
# Docker sandbox
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:3de483a98c5e24973e710b4f97b2dabcd3cb621f
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
diff --git a/.bazelversion b/.bazelversion
index 3d56cee..a602f58 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.0.0-pre.20220720.3
\ No newline at end of file
+6.0.0-pre.20220706.4
\ No newline at end of file
diff --git a/bazel/platform_mappings b/bazel/platform_mappings
new file mode 100644
index 0000000..060231b
--- /dev/null
+++ b/bazel/platform_mappings
@@ -0,0 +1,36 @@
+flags:
+ --cpu=arm64-v8a
+ --crosstool_top=//external:android/crosstool
+ @envoy//bazel:android_aarch64
+
+ --cpu=armeabi-v7a
+ --crosstool_top=//external:android/crosstool
+ @envoy//bazel:android_armeabi
+
+ --cpu=x86
+ --crosstool_top=//external:android/crosstool
+ @envoy//bazel:android_x86
+
+ --cpu=x86_64
+ --crosstool_top=//external:android/crosstool
+ @envoy//bazel:android_x86_64
+
+ --cpu=darwin_x86_64
+ --apple_platform_type=macos
+ @envoy//bazel:macos_x86_64
+
+ --cpu=darwin_arm64
+ --apple_platform_type=macos
+ @envoy//bazel:macos_arm64
+
+ --cpu=ios_x86_64
+ --apple_platform_type=ios
+ @envoy//bazel:ios_x86_64_platform
+
+ --cpu=ios_sim_arm64
+ --apple_platform_type=ios
+ @envoy//bazel:ios_sim_arm64_platform
+
+ --cpu=ios_arm64
+ --apple_platform_type=ios
+ @envoy//bazel:ios_arm64_platform
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 84b7bd7..b7fab47 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -13,8 +13,8 @@
load(":serf.bzl", "serf_build_rule")
load(":closure_compiler.bzl", "closure_library_rules")
-ENVOY_COMMIT = "5261b4285d1487f93e7aece94786de9a8d3a2529" # Aug 5, 2022
-ENVOY_SHA = "70e0485733d81ccb1076abc63114c3f3e0a17490843fc9041b0540dc27f23630"
+ENVOY_COMMIT = "dc168055154a99d10a2b170e8da078c6e8d001f3" # Aug 29th, 2022
+ENVOY_SHA = "b8cb775ffdae81b734ad9d15dce3af381facd17a28e477d0ba2837c56c2f667c"
BROTLI_COMMIT = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
BROTLI_SHA = "ba8be5d701b369f86d14f3701c81d6bf6c6c34015c183ff98352c12ea5f5226b"
diff --git a/pagespeed/controller/BUILD b/pagespeed/controller/BUILD
index be8c34a..dd7396c 100644
--- a/pagespeed/controller/BUILD
+++ b/pagespeed/controller/BUILD
@@ -23,7 +23,7 @@
proto_only = False,
use_external = False,
visibility = ["//visibility:public"],
- well_known_protos = True,
+ well_known_protos = False,
deps = [
":controller_proto_cc",
],
diff --git a/test/pagespeed/controller/BUILD b/test/pagespeed/controller/BUILD
index fa1d429..3d5654b 100644
--- a/test/pagespeed/controller/BUILD
+++ b/test/pagespeed/controller/BUILD
@@ -45,7 +45,7 @@
proto_only = False,
use_external = False,
visibility = ["//visibility:public"],
- well_known_protos = True,
+ well_known_protos = False,
deps = [
":grpc_test_proto_cc",
],
