commit 4f87826d231663230a2158d4a364aa6c1611a98a
author Dan Willemsen <dwillemsen@google.com> Fri Jan 20 01:09:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 01:09:34 2017 +0000
tree 8574b2c5846157dcde90e40a2a9ac6cded44eb63
parent d4aba70550a16555367aa121517dda5410aa7f06
parent bf28f5933a72b5e63120330e9c9037d4b248c6ba

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

Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98

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