commit d5aa03600e796b894bec7662852f5715bed9e19e
author Colin Cross <ccross@android.com> Tue Nov 15 23:38:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 15 23:38:01 2016 +0000
tree 6e50c3645299007f8ac4f48bab79ed1f81c421af
parent f97b27a9c06a61206dd1edbbfc5e11b2a293b462
parent 4ce94d297eaa1f41ce3db20d70bedaa432238c84

Merge "Don't pack relocations in libc.so"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 00932de..f326db3 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1649,6 +1649,9 @@
         keep_symbols: true,
     },
 
+    // Do not pack libc.so relocations; see http://b/20645321 for details.
+    pack_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