commit 2b473070126345e323d0694b87f88264cc9a77cc
author Elliott Hughes <enh@google.com> Tue Jan 22 15:10:19 2013 -0800
committer Elliott Hughes <enh@google.com> Tue Jan 22 15:10:19 2013 -0800
tree 1f626a0ab6ef690d17c7c52004615147fd768dba
parent 547eba0a63951d7db93c0542e1ecab891725b9a8

Our strcoll(3) is no different from NetBSD's, so take exactly theirs.

Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 7d66805..ee7fece 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -223,7 +223,6 @@
 	bionic/sigsuspend.c \
 	bionic/sleep.c \
 	bionic/statfs.c \
-	bionic/strcoll.c \
 	bionic/strndup.c \
 	bionic/strnlen.c \
 	bionic/strntoimax.c \
@@ -344,6 +343,7 @@
     upstream-netbsd/libc/stdlib/tsearch.c \
     upstream-netbsd/libc/string/memccpy.c \
     upstream-netbsd/libc/string/strcasestr.c \
+    upstream-netbsd/libc/string/strcoll.c \
     upstream-netbsd/libc/string/strxfrm.c \
     upstream-netbsd/libc/unistd/killpg.c \