Merge "Allow arm prebuilts for x86_arm builds"

2016-05-31 22:08:15 +00:00
parent 40623e2a99 b40d9ece5f
commit fcaae6bee8
1 changed files with 4 additions and 1 deletions
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -13,7 +13,10 @@ else
  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