From 452742d2bf4247106055696c11bc4e59ca630f11 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
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
Change-Id: Ia4470e0a6d388a7f8445c7f7f9a5639689c0fe32
---
 libc/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libc/Android.mk b/libc/Android.mk
index 2c33a8f11..4a20b3f7d 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1361,6 +1361,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