p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST" 

am: d52953e9ed

* commit 'd52953e9ed3a9625a61548234575acd4f0bbe87a':
  Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
This commit is contained in:
Dan Willemsen 2015-12-22 14:15:47 -08:00 committed by android-build-merger
parent 42c42b6971 d52953e9ed
commit 5a204d1d31
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/host_native_test.mk
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