diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-29 12:13:37 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-05-07 14:12:00 -0700 |
| commit | f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf (patch) | |
| tree | 8124d133e67941c9687051769801538f975d4c0d | |
| parent | 455ffaafcd5b6d0296bfa6143baccb01c84e2382 (diff) | |
| download | build-f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf.zip build-f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf.tar.gz build-f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf.tar.bz2 | |
Do not pack relocations for executables
Bug: http://b/20665974
Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67
(cherry picked from commit e24b6f77ffba8f7d9c2a7acbb7a0b748197d48c4)
| -rw-r--r-- | core/dynamic_binary.mk | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ ifeq ($(my_pack_module_relocations),) 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 |