| commit | fcaae6bee83c62703339f0e54751b244ef7fd7b7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue May 31 22:08:15 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 31 22:08:15 2016 +0000 |
| tree | 6f41fffb75b7695c0c7d64a3478e0cb9266c2268 | |
| parent | 40623e2a995247907028b12538a2732ac107a057 [diff] | |
| parent | b40d9ece5fd468c7d867b3fb776ecfb5c5cbdd03 [diff] |
Merge "Allow arm prebuilts for x86_arm builds"
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