Commit 8b9a464d authored Dec 21, 2015 by Dan Willemsen

Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST

The target BUILD_NATIVE_TEST defaults to building both 32 and 64-bit
versions of the tests. Many of our host tests have opted into this
manually, but some have not. Switch the default on the host tests to
stay consistent.

To preserve script compatibility, a symlink remains pointing to the
binary that would have been built before this change.

Change-Id: I9585984e933c2ac36134fc1968736c0bb5fea7be

parent 67e960b7

core/host_native_test.mk

+18 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,22 @@

		include $(BUILD_SYSTEM)/host_test_internal.mk

		needs_symlink :=
		ifndef LOCAL_MULTILIB
		ifndef LOCAL_32_BIT_ONLY
		LOCAL_MULTILIB := both

		ifeq (,$(LOCAL_MODULE_STEM_32)$(LOCAL_MODULE_STEM_64))
		LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
		LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
		needs_symlink := true
		endif
		endif
		endif

		include $(BUILD_HOST_EXECUTABLE)

		ifdef needs_symlink
		include $(BUILD_SYSTEM)/executable_prefer_symlink.mk
		needs_symlink :=
		endif