commit d52953e9ed3a9625a61548234575acd4f0bbe87a
author Dan Willemsen <dwillemsen@google.com> Tue Dec 22 22:05:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 22 22:05:30 2015 +0000
tree a72b0225e3a89a9b5f2db6e209e5f9fd9b4d3523
parent 4a017112672901130c7ceb6c778f1ca243f2dd49
parent 8b9a464de4599a8eee166c5265b64e3d08142a5a

Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"

core/host_native_test.mk

diff --git a/core/host_native_test.mk b/core/host_native_test.mk
index b54bd3a..7cba1ae 100644
--- a/core/host_native_test.mk
+++ b/core/host_native_test.mk
@@ -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