commit 96d0c1fd47911957e175e6a2e801e23051043915
author Dan Willemsen <dwillemsen@google.com> Fri Jan 20 01:30:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 01:30:28 2017 +0000
tree 017f84b973465eadf976fce31d2fca6e357fef53
parent 366902561d0186696f1e81b1b55412b3afbd7d4d
parent 9a5562312c04d0a6dfcab6c764f42f5cf86be6a6

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

Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3

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