commit d79dde610ede0ea65c2f6819ef7300b76ff97e0e
author Dan Willemsen <dwillemsen@google.com> Tue Jan 17 14:19:50 2017 -0800
committer Dan Willemsen <dwillemsen@google.com> Tue Jan 17 14:19:50 2017 -0800
tree a5dee429839b6721571a8fdce3710055711af4b7
parent cf4f7eac850dd7b88982f57ac747cb2b32a362ac

Support native test prebuilts for X86+ARM builds

This allows Soong native tests to be built and installed on these
builds.

Bug: 32177952
Test: m -j bionic-unit-tests
Change-Id: Ifbe39ba7a8991cb87d10c5da679992cf3065444e

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