commit e24b6f77ffba8f7d9c2a7acbb7a0b748197d48c4
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 29 12:13:37 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu May 07 13:10:02 2015 -0700
tree e8950837e2bc2bfb4f0e17bd4c68d19d812b06b4
parent afec6236bbb8ab13908ddd71b0bfd0a142928e01

Do not pack relocations for executables

Bug: http://b/20665974
Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index e13790b..b116283 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -87,13 +87,6 @@
                            $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)
     my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
     my_ldflags += -Wl,-rpath,$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RPATH)
-
-    # http://b/20665974
-    # The relocation packer is causing the kernel to load the executable
-    # overlapping ASAN's shadow space.
-    ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
-        LOCAL_PACK_MODULE_RELOCATIONS := false
-    endif
   endif
 endif
 

core/dynamic_binary.mk

diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index f015052..38c0cbe 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -50,8 +50,10 @@
   my_pack_module_relocations := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PACK_MODULE_RELOCATIONS)
 endif
 
-# Do not pack relocations for static executables.
-ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
+# Do not pack relocations for executables. Because packing results in
+# non-zero p_vaddr which causes kernel to load executables to lower
+# address (starting at 0x8000) http://b/20665974
+ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
   my_pack_module_relocations := false
 endif