commit 404f23f9ee0d6582a0a88e98288ac01fbbc759c7
author Dan Willemsen <dwillemsen@google.com> Tue May 31 22:35:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:35:18 2016 +0000
tree a3164aed6949fd023b04dc2797ac851ab5b80e5d
parent 683fd493b1b242eeb86915fc6f474e131a7f0d93
parent 9516a3335f29bc5a2c33b5bed10d3d27d41aecc7

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

* commit '9516a3335f29bc5a2c33b5bed10d3d27d41aecc7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Id213e11f192339a9d89a360378fc5ccb162f91ec

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