commit 452742d2bf4247106055696c11bc4e59ca630f11
author Dmitriy Ivanov <dimitry@google.com> Tue Apr 28 14:52:47 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Apr 28 14:54:11 2015 -0700
tree 37aa377169dc96343cda0362ed0c96a62179c826
parent 62a0a63e072c97ba7650bb564d87ac6daf767558

Do not pack relocations for libc.so

Bug: http://b/20645321
Bug: http://b/20655855
Change-Id: Ia4470e0a6d388a7f8445c7f7f9a5639689c0fe32

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 2c33a8f..4a20b3f 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1361,6 +1361,9 @@
 # meaningful name resolution.
 LOCAL_STRIP_MODULE := keep_symbols
 
+# Do not pack libc.so relocations; see http://b/20645321 for details.
+LOCAL_PACK_MODULE_RELOCATIONS := false
+
 # WARNING: The only library libc.so should depend on is libdl.so!  If you add other libraries,
 # make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries.  This
 # ensures that symbols that are pulled into those new libraries from libgcc.a are not declared