Support native test prebuilts for X86+ARM builds

This allows Soong native tests to be built and installed on these
builds.

Bug: 32177952
Test: m -j bionic-unit-tests
Change-Id: Ifbe39ba7a8991cb87d10c5da679992cf3065444e
This commit is contained in:
Dan Willemsen 2017-01-17 14:19:50 -08:00
parent cf4f7eac85
commit d79dde610e

View file

@ -15,7 +15,7 @@ else
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
# Only support prebuilt shared and static libraries for translated arch # Only support prebuilt shared and static libraries for translated arch
ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),) ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif endif