commit 52cbfd7f629358f7bb37a880dbbcc5d7c453ea3c
author Nathan Mulcahey <nmulcahey@google.com> Fri Dec 10 19:37:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 10 19:37:09 2021 +0000
tree 3f3584c5a939ce1837712f305fee97a70f391793
parent de3143f3eac60eb5087d1d76ac84bdcb0d001253
parent 8ccc527fe563ae77e5c7d80b4a4b2c1c132dc9cb

Merge "[tsan] Suppress TSan" into main

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 32592b6..5fdcd99 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -24,8 +24,14 @@
     "//third_party/rust_crates:log",
     "//third_party/rust_crates:ring",
   ]
-  non_rust_deps = [ "//third_party/boringssl" ]
 
+  # TODO(fxbug.dev/90208): Resolve data races and use instrumented BoringSSL
+  if (toolchain_variant.tags + [ "tsan" ] - [ "tsan" ] ==
+      toolchain_variant.tags) {
+    non_rust_deps = [ "//third_party/boringssl" ]
+  } else {
+    non_rust_deps = [ "//third_party/boringssl(${toolchain_variant.base})" ]
+  }
   sources = [
     "src/lib.rs",
     "src/octets.rs",