commit dcf50a3278cc00f9d405bbaa5f254e8d904bcf94
author Dmitriy Ivanov <dimitry@google.com> Thu May 07 15:12:30 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu May 07 15:16:19 2015 -0700
tree 9e544a4dffe48a93e8f51decee88257cbc15d3c9
parent b36fc1418eb4ccb7f8c4de8ee295da6bbbea25c9

Do not pack relocations for valgrind binaries

Change-Id: Ie88561dd5e4581d1e9650e10f32ede5af7ce0608
(cherry picked from commit b2769140d3032aa3e4b29be2d16c09a84a390700)

main/Android.build_one.mk

diff --git a/main/Android.build_one.mk b/main/Android.build_one.mk
index 61465a7..b801e06 100644
--- a/main/Android.build_one.mk
+++ b/main/Android.build_one.mk
@@ -36,6 +36,8 @@
 
 LOCAL_C_INCLUDES := $(common_includes) $(vg_local_c_includes)
 
+LOCAL_PACK_MODULE_RELOCATIONS := false
+
 LOCAL_CFLAGS := $(vg_local_cflags)
 LOCAL_CFLAGS_$(TARGET_ARCH) := $(vg_local_target_arch_cflags)
 LOCAL_CFLAGS_$(TARGET_2ND_ARCH) := $(vg_local_target_2nd_arch_cflags)