Merge "Support native test prebuilts for X86+ARM builds"

This commit is contained in:
Treehugger Robot 2017-01-20 00:59:41 +00:00 committed by Gerrit Code Review
commit bf28f5933a

View file

@ -15,7 +15,7 @@ else
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
# 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
endif
endif