Merge "Allow arm prebuilts for x86_arm builds"
This commit is contained in:
@@ -13,9 +13,12 @@ else
|
|||||||
my_prefix := TARGET_
|
my_prefix := TARGET_
|
||||||
|
|
||||||
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
|
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
|
||||||
|
# Only support prebuilt shared and static libraries for translated arch
|
||||||
|
ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
|
||||||
LOCAL_MULTILIB := first
|
LOCAL_MULTILIB := first
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
include $(BUILD_SYSTEM)/multilib.mk
|
include $(BUILD_SYSTEM)/multilib.mk
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user