commit 163248a8a183bd95a021326269e50f77cd500db5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 20 16:21:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 20 16:21:25 2024 +0000
tree a0aae13af99a2e03ead828f2e5aea344d0f1be52
parent 9328826d8565f6cdeba07b93d5abfc0cdadb815a
parent 8540eaa15e01a46b705df240f87896294dfe3809

Merge "libc: swap to llvm-libc for 8 fns on x86_64" into main am: 706487c70f am: 8540eaa15e

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

Change-Id: Ic571c170d41af8e0dce04fc8f67e61a9af3589cd
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 a07af64..608350b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -657,10 +657,7 @@
         },
         x86_64: {
             srcs: [
-                "upstream-openbsd/lib/libc/string/memchr.c",
-                "upstream-openbsd/lib/libc/string/memrchr.c",
-                "upstream-openbsd/lib/libc/string/strlcat.c",
-                "upstream-openbsd/lib/libc/string/strlcpy.c",
+                // x86_64 has custom/llvm-libc implementations of all of these.
             ],
         },
     },
@@ -1216,11 +1213,6 @@
                 "arch-x86_64/string/sse4-memcmp-slm.S",
                 "arch-x86_64/string/ssse3-strcmp-slm.S",
                 "arch-x86_64/string/ssse3-strncmp-slm.S",
-
-                "bionic/strchr.cpp",
-                "bionic/strchrnul.cpp",
-                "bionic/strnlen.cpp",
-                "bionic/strrchr.cpp",
             ],
         },
     },