Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23

am: b7303cde95

Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
This commit is contained in:
Dan Willemsen 2017-01-20 01:20:08 +00:00 committed by android-build-merger
commit 9a5562312c
1 changed files with 1 additions and 1 deletions

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