commit b40d9ece5fd468c7d867b3fb776ecfb5c5cbdd03
author Dan Willemsen <dwillemsen@google.com> Tue May 31 13:59:38 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Tue May 31 14:01:34 2016 -0700
tree 6f41fffb75b7695c0c7d64a3478e0cb9266c2268
parent 40623e2a995247907028b12538a2732ac107a057

Allow arm prebuilts for x86_arm builds

But only for static and shared libraries -- we disable building other
types of modules for arm, so don't support the prebuilts for them
either.

This is needed so that we can build these libraries under Soong, and
expose them to Make using BUILD_PREBUILT.

Bug: 27526885
Change-Id: I4f6ec922aed37591b6257b7022b81fb65d05b0fe

core/prebuilt.mk

diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index f1edc8a..7b83467 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -13,7 +13,10 @@
   my_prefix := TARGET_
 
   ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-    LOCAL_MULTILIB := first
+    # Only support prebuilt shared and static libraries for translated arch
+    ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
+      LOCAL_MULTILIB := first
+    endif
   endif
 endif