diff options
| author | Christopher Ferris <cferris@google.com> | 2015-06-04 19:24:07 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-06-06 13:25:32 -0700 |
| commit | 7a799f2b02ee453a46ee368cd8c41477e0567852 (patch) | |
| tree | 80783f5efdcfcb90130a375b9e4de9a8b673e31d | |
| parent | e997e9155e72f1b0b40d832ac91fd39951acc1b9 (diff) | |
| download | android_bionic-7a799f2b02ee453a46ee368cd8c41477e0567852.tar.gz android_bionic-7a799f2b02ee453a46ee368cd8c41477e0567852.tar.bz2 android_bionic-7a799f2b02ee453a46ee368cd8c41477e0567852.zip | |
Fix a few libc makefile mishaps.
These are the problems fixed in this CL:
- The ndk_cruft.cpp file was not compiled for 64 bit.
- Some files where not compiled for libc_bionic.a due to a missing
patch-up-arch-specific-flags call.
- The libc_bionic_ndk.a patch up call was using bionic src, not
the bionic_ndk_src_files.
- Move mmap.cpp to the ndk src list where it was before because of
the above errors.
Bug: 21640784
(cherry picked from commit 19fee2ca8beb4fae5b5c142de19757410171dc93)
Change-Id: Ib9a9cfd72720586d3400b11cd7189f021e9a06c6
| -rw-r--r-- | libc/Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 4dd108653..620f438da 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -549,14 +549,16 @@ libc_thread_atexit_impl_src_files := \ 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_ADDRESS_SANITIZER := false 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_ADDRESS_SANITIZER := false 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) |