commit c82c0b7e072491da4818e7de37411fbb2055fce1
author Dan Albert <danalbert@google.com> Mon Jun 16 16:52:27 2014 -0700
committer Dan Albert <danalbert@google.com> Mon Jun 16 16:52:27 2014 -0700
tree 52915af97820de3316dab31073920c141ad861a3
parent a217a0cdb3ff78f6b59d64fd4356f87643ad9d1e

Remove SHA1 from LP64 in favor of libcrypto.

Keep the symbols around on LP32 for binary compatibility.

Bug: 11156955
Change-Id: I379a7e0fa3092e9a70daeafcbcb2aacfc314031a

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index bc6cf78..37f3059 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -262,7 +262,6 @@
     upstream-freebsd/lib/libc/string/wmemset.c \
 
 libc_upstream_netbsd_src_files := \
-    upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
     upstream-netbsd/common/lib/libc/stdlib/random.c \
     upstream-netbsd/lib/libc/gen/ftw.c \
     upstream-netbsd/lib/libc/gen/nftw.c \
@@ -699,6 +698,7 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
 $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_netbsd_src_files))
 include $(BUILD_STATIC_LIBRARY)