commit 99e2c216b42bc2d7cad75f1f3aab432f12678b1d
author Dan Willemsen <dwillemsen@google.com> Tue May 31 22:20:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:20:19 2016 +0000
tree 9f76d07e818eda1582e864c6df0349cb596d650e
parent 1d7930b2bedad092189bca3336a9cf717b9b4f37
parent fcaae6bee83c62703339f0e54751b244ef7fd7b7

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

* commit 'fcaae6bee83c62703339f0e54751b244ef7fd7b7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41

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