From 62d6533c1ac4b32568ffcbebb41d480a730eb8bb Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Tue, 28 Apr 2015 14:52:47 -0700 Subject: [PATCH] Do not pack relocations for libc.so Bug: http://b/20645321 Bug: http://b/20655855 (cherry picked from commit 452742d2bf4247106055696c11bc4e59ca630f11) Change-Id: Ic9125cc1bc4c9ba9eb20d030de72e3ce1fb86fa6 --- libc/Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libc/Android.mk b/libc/Android.mk index 61f345431..d41f8afa5 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1352,6 +1352,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \ # 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