diff options
| author | Dan Albert <danalbert@google.com> | 2015-12-09 23:41:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-09 23:41:01 +0000 |
| commit | 30cb36ff5e4834800a0c4694d0ccfe9759ffea83 (patch) | |
| tree | b442c5d13c4279e4969d28a90812f912fdd01e08 | |
| parent | 31066abfde08abdefe00be67074a2c7401917f97 (diff) | |
| parent | ee629c9ffbea831e9b2a47575a8ad3f457b7c6b5 (diff) | |
| download | build-30cb36ff5e4834800a0c4694d0ccfe9759ffea83.tar.gz | |
Merge "Build NDK binaries with --hash-style=both."
| -rw-r--r-- | core/binary.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/binary.mk b/core/binary.mk index 60a95aebb1..1465fa55ec 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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 |