Merge "Fix the mips build."

am: 0f8bd686e1

* commit '0f8bd686e1ef6f5936d478cff4de8d9248daca35':
  Fix the mips build.
This commit is contained in:
Dan Albert 2015-12-09 16:34:52 -08:00 committed by android-build-merger
commit 064b18f155

View file

@ -87,7 +87,11 @@ ifdef LOCAL_SDK_VERSION
# hashes (which are much faster!), but shipping to older devices requires # 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 # the old style hash. Fortunately, we can build with both and it'll work
# anywhere. # 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. # We don't want to expose the relocation packer to the NDK just yet.
LOCAL_PACK_MODULE_RELOCATIONS := false LOCAL_PACK_MODULE_RELOCATIONS := false