commit 5a7c7ad3c64359af172a35387943e82c5d2a3f01
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 12 17:50:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 12 17:50:15 2023 +0000
tree 603e4a16fbcde08e8a1aafed66a11f8e9233891c
parent b28f190f2589ed5f6f3d1b5fa82f6d0d412d4420
parent e4eafe8db5a857b4e37b505183d1c4bd73d395b4

Merge "librust_baremetal: Add memcpy_chk" am: 716ed9b931 am: e4eafe8db5

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

Change-Id: Ic0f393edd969abccf9d0cdb76f4215b3d18866ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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",
     ],