From 8dca15f287cfc5c84a719e43e80a497617d11ca6 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 9 Dec 2015 16:26:20 -0800 Subject: [PATCH] Fix the mips build. The linker can't do --hash-style=gnu for mips. Change-Id: I66a77067f8be6fc92ca686d3e6e159beb72cf76b --- core/binary.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index bc4ee6b7f..9ac609c2c 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -87,7 +87,11 @@ ifdef LOCAL_SDK_VERSION # 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