Merge "Build NDK binaries with --hash-style=both."

This commit is contained in:
Dan Albert 2015-12-09 23:41:01 +00:00 committed by Gerrit Code Review
commit 30cb36ff5e
1 changed files with 6 additions and 5 deletions

View File

@ -85,11 +85,12 @@ ifdef LOCAL_SDK_VERSION
# The bionic linker now has support for packed relocations and gnu style # The bionic linker now has support for packed relocations and gnu style
# hashes (which are much faster!), but shipping to older devices requires # hashes (which are much faster!), but shipping to older devices requires
# the old style hash and disabling packed relocations. # the old style hash. Fortunately, we can build with both and it'll work
#ifeq ($(shell expr $(LOCAL_SDK_VERSION) >= FIRST_SUPPORTED_VERSION),0) # anywhere.
my_ldflags += -Wl,--hash-style=sysv my_ldflags += -Wl,--hash-style=both
LOCAL_PACK_MODULE_RELOCATIONS := false
#endif # 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. # Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location.
# See ndk/docs/CPLUSPLUS-SUPPORT.html # See ndk/docs/CPLUSPLUS-SUPPORT.html