commit 13d79abebe472d63288481b419ff36489345000f
author Elliott Hughes <enh@google.com> Fri Apr 15 17:40:33 2016 -0700
committer Elliott Hughes <enh@google.com> Mon Apr 18 12:05:18 2016 -0700
tree 27d16910595a83f0d8b0495d4deaa7641d4b62c0
parent 668fddb3ba36b52a16381513b1a0a42d9dd910e1

Fix ftw/nftw to only report unreadable directories once.

Also remove all the copy & paste.

Bug: http://b/28197840
Change-Id: Ia43e9ffd838dabb511a6e54403d6f62066383e4d

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 2fb4984..8024912 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -307,8 +307,6 @@
     defaults: ["libc_defaults"],
     srcs: [
         "upstream-netbsd/common/lib/libc/stdlib/random.c",
-        "upstream-netbsd/lib/libc/gen/ftw.c",
-        "upstream-netbsd/lib/libc/gen/nftw.c",
         "upstream-netbsd/lib/libc/gen/nice.c",
         "upstream-netbsd/lib/libc/gen/popen.c",
         "upstream-netbsd/lib/libc/gen/psignal.c",
@@ -1280,6 +1278,7 @@
         "bionic/fpclassify.cpp",
         "bionic/fsetxattr.cpp",
         "bionic/ftruncate.cpp",
+        "bionic/ftw.cpp",
         "bionic/futimens.cpp",
         "bionic/getcwd.cpp",
         "bionic/getdomainname.cpp",