commit 9516a3335f29bc5a2c33b5bed10d3d27d41aecc7
author Dan Willemsen <dwillemsen@google.com> Tue May 31 22:25:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:25:47 2016 +0000
tree 3ce11578dc10eda9ebbffb2767192441fa189259
parent 8a3f292c923ca46fd0a8197f620f2df5ce5271a4
parent 6a55b1c6813050d04c39e0705da4f056f3981511

Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8 am: 99e2c216b4
am: 6a55b1c681

* commit '6a55b1c6813050d04c39e0705da4f056f3981511':
  Allow arm prebuilts for x86_arm builds

Change-Id: Icb91d7af56463fa97484ef36ee3e8275b2e5810e

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