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

am: bf28f5933a

Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
This commit is contained in:
Dan Willemsen
2017-01-20 01:09:34 +00:00
committed by android-build-merger

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