[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: a77b5a6d89 -s ours
am skip reason: Merged-In Iab4145a18c9d216689d68b83adf747ec4f229ade with SHA-1 97679a7bf2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/20949485
Change-Id: I11af8ca247c2e2d7c558abf7fc41c381321ebb01
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 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",
],