commit bf28f5933a72b5e63120330e9c9037d4b248c6ba
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 20 00:59:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 20 00:59:42 2017 +0000
tree 8574b2c5846157dcde90e40a2a9ac6cded44eb63
parent f8acdc50fa88eb5b3cd819547a93408ea65fb8eb
parent d79dde610ede0ea65c2f6819ef7300b76ff97e0e

Merge "Support native test prebuilts for X86+ARM builds"

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