Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"

This commit is contained in:
Dan Willemsen 2015-12-22 22:05:30 +00:00 committed by Gerrit Code Review
commit d52953e9ed
1 changed files with 18 additions and 0 deletions

View File

@ -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