tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"

Browse source 
* commit 'cda3d43345a43059065b538b63228007a2da62fc':
  Disable packed relocations for NDK builds
This commit is contained in:
Dmitriy Ivanov 2015-04-24 05:19:24 +00:00 committed by Android Git Automerger
commit 6a2b812b8c
1 changed files with 4 additions and 2 deletions
Show stats 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.