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

Merge "Build NDK binaries with --hash-style=both." am: 30cb36ff5e

Browse Source 
am: 0477dce031

* commit '0477dce031cadff3f2b9d64fe35a3bd9afa8810f':
  Build NDK binaries with --hash-style=both.
This commit is contained in:
Dan Albert
2015-12-09 23:50:25 +00:00
committed by android-build-merger
parent 813667b722 0477dce031
commit 7de99574dc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/binary.mk
View File

@@ -85,11 +85,12 @@ ifdef LOCAL_SDK_VERSION
# 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
# the old style hash. Fortunately, we can build with both and it'll work
# anywhere.
my_ldflags += -Wl,--hash-style=both
# We don't want to expose the relocation packer to the NDK just yet.
LOCAL_PACK_MODULE_RELOCATIONS := false
# Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location.
# See ndk/docs/CPLUSPLUS-SUPPORT.html