Merge "Workaround boot loop by turning off stack protector check for noreturn calls" am: ab3a319746 am: 725df4c5de am: 801b77c7b2

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2483436

Change-Id: I174a636e9e1c2ef660a331f51ab6cf87964106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libc/Android.bp b/libc/Android.bp
index 99261f9..93f9ce9 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2147,6 +2147,10 @@
     name: "crt_defaults",
     defaults: ["crt_and_memtag_defaults"],
     system_shared_libs: [],
+
+    conlyflags: [
+        "-mllvm -disable-check-noreturn-call",
+    ]
 }
 
 cc_defaults {