diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-23 18:48:52 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-23 18:55:23 -0700 |
| commit | 3b51f20be916f924ebf456172a664b75ed20e755 (patch) | |
| tree | 766bb5a063f00b829d852d82ba7c4edafee5ad89 /core/binary.mk | |
| parent | 648f1b66b4a6532383d5382148d586d354026305 (diff) | |
| download | build-3b51f20be916f924ebf456172a664b75ed20e755.zip build-3b51f20be916f924ebf456172a664b75ed20e755.tar.gz build-3b51f20be916f924ebf456172a664b75ed20e755.tar.bz2 | |
Disable packed relocations for NDK builds
Bug: http://b/20537715
Change-Id: I1289a88d5eb694980b026b695cb25edd8ba76ed5
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/binary.mk b/core/binary.mk index 8eefa76..d3d050e 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -77,10 +77,12 @@ ifdef LOCAL_SDK_VERSION my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/lib endif - # The bionic linker now has support for gnu style hashes (which are much - # faster!), but shipping to older devices requires the old style hash. + # The bionic linker now has support for packed relocations and gnu style + # hashes (which are much faster!), but shipping to older devices requires + # the old style hash and disabling packed relocations. #ifeq ($(shell expr $(LOCAL_SDK_VERSION) >= FIRST_SUPPORTED_VERSION),0) my_ldflags += -Wl,--hash-style=sysv + LOCAL_PACK_MODULE_RELOCATIONS := false #endif # Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location. |