commit cad05d2e212f2e38974732826a86adc199504a00
author Peter Collingbourne <pcc@google.com> Wed Dec 11 20:40:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 20:40:03 2019 +0000
tree 3aba31a56f25a8b35aac93bc8962e52940696ec8
parent d4299c3f0fb5b4add513b326817f6ce5f49e1fb5
parent 570de3337ded15501a7ac79ec2fcc70ab44ee1dd

Merge "Stop linking ndk_cruft*.cpp into libc.a."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 26cd3a3..ae5f39e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -20,13 +20,8 @@
     "stdlib/exit.c",
 ]
 
-// Various kinds of cruft.
+// off64_t/time64_t support on LP32.
 // ========================================================
-libc_common_src_files += [
-    "bionic/ndk_cruft.cpp",
-    "bionic/ndk_cruft_data.cpp",
-]
-
 libc_common_src_files_32 = [
     "bionic/legacy_32_bit_support.cpp",
     "bionic/time64.c",
@@ -1609,6 +1604,8 @@
         "bionic/malloc_common_dynamic.cpp",
         "bionic/malloc_heapprofd.cpp",
         "bionic/malloc_limit.cpp",
+        "bionic/ndk_cruft.cpp",
+        "bionic/ndk_cruft_data.cpp",
         "bionic/NetdClient.cpp",
         "arch-common/bionic/crtend_so.S",
     ],