commit 97950cb186e67fba64d34ecc0584b78a1d6533e6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 12 01:12:14 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 12 01:12:14 2023 +0000
tree 9117538a68fedee9953718b9150eec2bd7e56d26
parent 4473a937df68dcd151b0135bd2a4e91b194265fc
parent f5968d82f562e4f43b05ffa54ac7df16396351bc

Merge "Rename files/modules that have the same name"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 477dca2..7eaa1bf 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2147,10 +2147,6 @@
     name: "crt_defaults",
     defaults: ["crt_and_memtag_defaults"],
     system_shared_libs: [],
-
-    conlyflags: [
-        "-mllvm -disable-check-noreturn-call",
-    ]
 }
 
 cc_defaults {
@@ -2183,6 +2179,8 @@
     srcs: ["arch-common/bionic/crtbrand.S"],
 
     defaults: ["crt_so_defaults"],
+    // crtbrand is an intermediate artifact, not a final CRT object.
+    exclude_from_ndk_sysroot: true,
 }
 
 cc_object {