StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable packed relocations for NDK builds"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2015-04-24 04:48:43 +00:00
committed by Gerrit Code Review
parent 648f1b66b4 3b51f20be9
commit 529943c723
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/binary.mk
View File

@@ -77,10 +77,12 @@ ifdef LOCAL_SDK_VERSION
my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/lib my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/lib
endif endif
# The bionic linker now has support for gnu style hashes (which are much # The bionic linker now has support for packed relocations and gnu style
# faster!), but shipping to older devices requires the old style hash. # 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) #ifeq ($(shell expr $(LOCAL_SDK_VERSION) >= FIRST_SUPPORTED_VERSION),0)
my_ldflags += -Wl,--hash-style=sysv my_ldflags += -Wl,--hash-style=sysv
LOCAL_PACK_MODULE_RELOCATIONS := false
#endif #endif
# Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location. # Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location.