commit 20f3399956b691d79b3979d586d76d8180113f07
author Elliott Hughes <enh@google.com> Thu Jul 13 09:45:00 2017 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 13 09:45:00 2017 -0700
tree 288c7548e672dfbd3cb1264a64145487d47423f7
parent 3537331942cdebab5ab53104b852c997a9bc0be5

Switch to FreeBSD for wcsstr and wmemcpy.

Almost all of our w* functions come from FreeBSD already. The one downside is
that we can't take all our w* functions from FreeBSD because FreeBSD handles
locales very differently from us.

Bug: N/A
Test: ran tests
Change-Id: I177b4332499992babd5d5afe5b3f469f8c4345a5

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index cd2a727..231f762 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -237,9 +237,11 @@
         "upstream-freebsd/lib/libc/string/wcspbrk.c",
         "upstream-freebsd/lib/libc/string/wcsrchr.c",
         "upstream-freebsd/lib/libc/string/wcsspn.c",
+        "upstream-freebsd/lib/libc/string/wcsstr.c",
         "upstream-freebsd/lib/libc/string/wcstok.c",
         "upstream-freebsd/lib/libc/string/wmemchr.c",
         "upstream-freebsd/lib/libc/string/wmemcmp.c",
+        "upstream-freebsd/lib/libc/string/wmemcpy.c",
         "upstream-freebsd/lib/libc/string/wmemmove.c",
         "upstream-freebsd/lib/libc/string/wmemset.c",
     ],
@@ -501,9 +503,7 @@
         "upstream-openbsd/lib/libc/string/strspn.c",
         "upstream-openbsd/lib/libc/string/strstr.c",
         "upstream-openbsd/lib/libc/string/strtok.c",
-        "upstream-openbsd/lib/libc/string/wmemcpy.c",
         "upstream-openbsd/lib/libc/string/wcslcpy.c",
-        "upstream-openbsd/lib/libc/string/wcsstr.c",
         "upstream-openbsd/lib/libc/string/wcswidth.c",
     ],