commit 966f84b11dca7caf53c67664d811b99567cab7ee
author Christopher Ferris <cferris@google.com> Sat Jun 06 00:07:57 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 06 00:07:58 2015 +0000
tree 6247060c105b5aaf01b5cedb94507d8df99f36dd
parent 12ca831b0e03e85a2f5588bdf834dc6046d1ac6c
parent 19fee2ca8beb4fae5b5c142de19757410171dc93

Merge "Fix a few libc makefile mishaps."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 4dd1086..620f438 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -549,14 +549,16 @@
 libc_arch_static_src_files := \
     bionic/dl_iterate_phdr_static.cpp \
 
-# Various kinds of LP32 cruft.
+# Various kinds of cruft.
 # ========================================================
-libc_bionic_src_files_32 += \
+libc_common_src_files += \
+    bionic/ndk_cruft.cpp \
+
+libc_bionic_ndk_src_files_32 += \
     bionic/mmap.cpp \
 
 libc_common_src_files_32 += \
     bionic/legacy_32_bit_support.cpp \
-    bionic/ndk_cruft.cpp \
     bionic/time64.c \
 
 libc_netbsd_src_files_32 += \
@@ -956,6 +958,7 @@
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 
 $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_src_files))
 include $(BUILD_STATIC_LIBRARY)
 
 
@@ -983,7 +986,7 @@
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 
 $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
-$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_src_files))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_ndk_src_files))
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)