commit 9a5562312c04d0a6dfcab6c764f42f5cf86be6a6
author Dan Willemsen <dwillemsen@google.com> Fri Jan 20 01:20:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 01:20:08 2017 +0000
tree 2bf3d438733f8f2790ea53aa549a66f3baf84801
parent 239c78a5b349f2adab2f816a012cb84a035205df
parent b7303cde957ea7cd3c377ef6af64b7861e74bbb6

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

Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c

core/prebuilt.mk

diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 5831e24..839e14f 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -15,7 +15,7 @@
 
   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