commit 2d83955724182e44c41476177ac841505783629a
author Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Fri Dec 24 01:27:51 2021 -0800
committer Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Fri Dec 24 01:27:51 2021 -0800
tree 09dbe229776f4da4d9e03a83766b52a6c4cae9ce
parent 1697706df708daaefe02450726f80a69990d10d8
parent bbde6ba9b3c8ef4b86c5096d3b836c6490eca280

Version 2.16.0-135.0.dev

Merge commit 'bbde6ba9b3c8ef4b86c5096d3b836c6490eca280' into 'dev'

runtime/bin/address_sanitizer.cc

diff --git a/runtime/bin/address_sanitizer.cc b/runtime/bin/address_sanitizer.cc
index a780894..4b8776d 100644
--- a/runtime/bin/address_sanitizer.cc
+++ b/runtime/bin/address_sanitizer.cc
@@ -7,6 +7,7 @@
 #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX)
 #if defined(__has_feature)
 #if __has_feature(address_sanitizer)
+#if !defined(GOOGLE3)
 
 const char* kAsanDefaultOptions =
     "strict_memcmp=0 symbolize=0 check_printf=1 use_sigaltstack=1 "
@@ -21,6 +22,7 @@
   return kAsanDefaultOptions;
 }
 
+#endif  // !defined(GOOGLE3)
 #endif  // __has_feature(address_sanitizer)
 #endif  // defined(__has_feature)
 #endif  //  defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX)

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index e3f97717..3999cce 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 16
 PATCH 0
-PRERELEASE 134
+PRERELEASE 135
 PRERELEASE_PATCH 0
\ No newline at end of file