commit 6a55b1c6813050d04c39e0705da4f056f3981511
author Dan Willemsen <dwillemsen@google.com> Tue May 31 22:23:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:23:11 2016 +0000
tree df1f9042a4c89fc40b55252ce75f833aab145a59
parent eaa4ef4cfc7faecde17e21a4016d95ff8913f459
parent 99e2c216b42bc2d7cad75f1f3aab432f12678b1d

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

* commit '99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7

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