commit 0ba8a9cecc0a0a1a6d58a087cdf88b308185ff2b
author Dan Albert <danalbert@google.com> Thu Dec 10 00:37:26 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 00:37:26 2015 +0000
tree 5bcadf29fb38bc451edccb7c6907c4d84288f3ec
parent 17310f6e65ba21f4c85e7de19971008a9a57866f
parent 064b18f1558c2a2ef9a82451a8955c4bfebbbac4

Merge "Fix the mips build." am: 0f8bd686e1
am: 064b18f155

* commit '064b18f1558c2a2ef9a82451a8955c4bfebbbac4':
  Fix the mips build.

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 27564ac..93015ba 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -87,7 +87,11 @@
   # hashes (which are much faster!), but shipping to older devices requires
   # the old style hash. Fortunately, we can build with both and it'll work
   # anywhere.
-  my_ldflags += -Wl,--hash-style=both
+  #
+  # This is not currently supported on MIPS architectures.
+  ifeq (,$(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))
+    my_ldflags += -Wl,--hash-style=both
+  endif
 
   # We don't want to expose the relocation packer to the NDK just yet.
   LOCAL_PACK_MODULE_RELOCATIONS := false