Update Envoy to 25db910b0f12ec22ddad82f5f1ea49efe3df635a (#2037)
* Update Envoy to 25db910b0f12ec22ddad82f5f1ea49efe3df635a
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
* Amendments for deprecated RunningOnValgrind()
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
diff --git a/.bazelrc b/.bazelrc
index ff93d41..5b07aa2 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -193,6 +193,11 @@
build:rbe-toolchain-msvc-cl --crosstool_top=@rbe_windows_msvc_cl//cc:toolchain
build:rbe-toolchain-msvc-cl --extra_toolchains=@rbe_windows_msvc_cl//config:cc-toolchain
+build:rbe-toolchain-clang-cl --host_platform=@rbe_windows_clang_cl//config:platform
+build:rbe-toolchain-clang-cl --platforms=@rbe_windows_clang_cl//config:platform
+build:rbe-toolchain-clang-cl --crosstool_top=@rbe_windows_clang_cl//cc:toolchain
+build:rbe-toolchain-clang-cl --extra_toolchains=@rbe_windows_clang_cl//config:cc-toolchain
+
build:remote --spawn_strategy=remote,sandboxed,local
build:remote --strategy=Javac=remote,sandboxed,local
build:remote --strategy=Closure=remote,sandboxed,local
@@ -224,11 +229,16 @@
build:remote-msan --config=rbe-toolchain-msan
build:remote-msvc-cl --config=remote-windows
+build:remote-msvc-cl --config=msvc-cl
build:remote-msvc-cl --config=rbe-toolchain-msvc-cl
+build:remote-clang-cl --config=remote-windows
+build:remote-clang-cl --config=clang-cl
+build:remote-clang-cl --config=rbe-toolchain-clang-cl
+
# Docker sandbox
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:923df85a4ba7f30dcd0cb6b0c6d8d604f0e20f48
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:e7ea4e81bbd5028abb9d3a2f2c0afe063d9b62c0
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
@@ -321,6 +331,7 @@
try-import %workspace%/clang.bazelrc
try-import %workspace%/user.bazelrc
+try-import %workspace%/local_tsan.bazelrc
###### modifications for pagespeed
build --linkopt -ldl
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index aae1b77..c8f16c6 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 = "3147d91a40d6aca684cfb4fd159c8876995502d1" # August 20th, 2020
-ENVOY_SHA = "fce665401000734d20f35d895e46097db37fff427a2d882759bdeeece1857c88"
+ENVOY_COMMIT = "25db910b0f12ec22ddad82f5f1ea49efe3df635a" # September 9th, 2020
+ENVOY_SHA = "cf26c7ed8b170e4f45ca57b11d21d2c339a3584488d273d0c0a62baaf6265cd5"
BROTLI_COMMIT = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
BROTLI_SHA = "ba8be5d701b369f86d14f3701c81d6bf6c6c34015c183ff98352c12ea5f5226b"
HIREDIS_COMMIT = "0.14.1" # July 24th, 2020
diff --git a/extensions_build_config.bzl b/extensions_build_config.bzl
index b4d326c..2c643d7 100644
--- a/extensions_build_config.bzl
+++ b/extensions_build_config.bzl
@@ -6,7 +6,7 @@
"envoy.transport_sockets.raw_buffer": "//source/extensions/transport_sockets/raw_buffer:config",
}
-# This can be used to extend the visibility rules for Envoy extensions
-# (//:extension_config and //:extension_library in //BUILD)
-# if downstream Envoy builds need to directly reference envoy extensions.
-ADDITIONAL_VISIBILITY = []
+# These can be changed to ["//visibility:public"], for downstream builds which
+# need to directly reference Envoy extensions.
+EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
+EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
diff --git a/pagespeed/envoy/envoy_url_async_fetcher_test.cc b/pagespeed/envoy/envoy_url_async_fetcher_test.cc
index a1833c1..b6571c5 100644
--- a/pagespeed/envoy/envoy_url_async_fetcher_test.cc
+++ b/pagespeed/envoy/envoy_url_async_fetcher_test.cc
@@ -57,7 +57,7 @@
const char kFetchHost[] = "selfsigned.modpagespeed.com";
// const int kThreadedPollMs = 200;
-const int kFetcherTimeoutMs = 5 * 1000;
+// const int kFetcherTimeoutMs = 5 * 1000;
const int kFetcherTimeoutValgrindMs = 20 * 1000;
// const int kModpagespeedSite = 0; // TODO(matterbury): These should be an
@@ -124,7 +124,9 @@
void SetUp() override { SetUpWithProxy(""); }
static int64 FetcherTimeoutMs() {
- return RunningOnValgrind() ? kFetcherTimeoutValgrindMs : kFetcherTimeoutMs;
+ return kFetcherTimeoutValgrindMs;
+ // TODO(oschaaf): figure out substitute for deprecated absl::RunningOnValgrind()
+ // return RunningOnValgrind() ? kFetcherTimeoutValgrindMs : kFetcherTimeoutMs;
}
void SetUpWithProxy(const char* proxy) {
