diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 05:19:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 05:19:24 +0000 |
| commit | 6a2b812b8cc5ac7ea051d2c09651e12d08217919 (patch) | |
| tree | 65e2ecc98fe92c8161866e45c6bc24d6d8df0c7f | |
| parent | 6f2935dc1432a38e149498b6efbd43ed9aceb827 (diff) | |
| parent | cda3d43345a43059065b538b63228007a2da62fc (diff) | |
| download | build-6a2b812b8cc5ac7ea051d2c09651e12d08217919.zip build-6a2b812b8cc5ac7ea051d2c09651e12d08217919.tar.gz build-6a2b812b8cc5ac7ea051d2c09651e12d08217919.tar.bz2 | |
am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit 'cda3d43345a43059065b538b63228007a2da62fc':
Disable packed relocations for NDK builds
| -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. |