commit 064b18f1558c2a2ef9a82451a8955c4bfebbbac4
author Dan Albert <danalbert@google.com> Wed Dec 09 16:34:52 2015 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 09 16:34:52 2015 -0800
tree 8ded3aa9648ff0e0d32e0e74f38932c9753df4f7
parent 9a986a6e682e2c22b5a63637589a88314a83316b
parent 0f8bd686e1ef6f5936d478cff4de8d9248daca35

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

* commit '0f8bd686e1ef6f5936d478cff4de8d9248daca35':
  Fix the mips build.

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index bc4ee6b..9ac609c 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