From 1f2c61f36272c04fa4441a3ce864ef232ff1b68e Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Wed, 23 Jun 2021 19:25:01 -0700
Subject: [PATCH] gn build: Build ubsan_minimal on Android.

---
 utils/gn/secondary/compiler-rt/lib/BUILD.gn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/gn/secondary/compiler-rt/lib/BUILD.gn b/utils/gn/secondary/compiler-rt/lib/BUILD.gn
index ce32282c722..43bc7fdf351 100644
--- a/utils/gn/secondary/compiler-rt/lib/BUILD.gn
+++ b/utils/gn/secondary/compiler-rt/lib/BUILD.gn
@@ -1,10 +1,10 @@
 group("lib") {
   deps = [ "//compiler-rt/lib/profile" ]
   if (current_os == "linux") {
-    deps += [
-      "//compiler-rt/lib/msan",
-      "//compiler-rt/lib/ubsan_minimal",
-     ]
+    deps += [ "//compiler-rt/lib/msan" ]
+  }
+  if (current_os == "linux" || current_os == "android") {
+    deps += [ "//compiler-rt/lib/ubsan_minimal" ]
   }
   if (current_os != "win") {
     deps += [