From ee629c9ffbea831e9b2a47575a8ad3f457b7c6b5 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 9 Dec 2015 14:52:25 -0800
Subject: [PATCH] Build NDK binaries with --hash-style=both.

Change-Id: I1c3b7415c654b783c6bb7e38a40d4c279826400f
---
 core/binary.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/binary.mk b/core/binary.mk
index 60a95aebb..1465fa55e 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