commit 716ed9b931aea4a610c2650f419ef453217e9961
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 12 16:26:17 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 16:26:17 2023 +0000
tree 603e4a16fbcde08e8a1aafed66a11f8e9233891c
parent 42f97f5288ee377247509133d37844149d282f05
parent 199a62e39bcdf315493cd99311b73842d43100f8

Merge "librust_baremetal: Add memcpy_chk"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 6442bc9..3b8507e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2272,6 +2272,10 @@
 // libc dependencies for baremetal Rust projects.
 // ========================================================
 
+// This library contains the following unresolved symbols:
+//     __errno
+//     abort
+//     async_safe_fatal_va_list
 cc_library_static {
     name: "librust_baremetal",
     header_libs: ["libc_headers"],
@@ -2283,6 +2287,17 @@
         "-Wall",
         "-Werror",
     ],
+    srcs: [
+        "bionic/fortify.cpp",
+    ],
+    arch: {
+        arm64: {
+            cflags: ["-DHAVE_ASSEMBLER___MEMCPY_CHK"],
+            srcs: [
+                "arch-arm64/string/__memcpy_chk.S",
+            ],
+        },
+    },
     whole_static_libs: [
         "libarm-optimized-routines-mem",
     ],