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

am: 4f87826d23

Change-Id: I918859e58ab5d753e8a9cc83fc8f2eab940acbb9
This commit is contained in:
Dan Willemsen 2017-01-20 01:14:05 +00:00 committed by android-build-merger
commit b7303cde95

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