StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow arm prebuilts for x86_arm builds"

Browse Source 
am: fcaae6bee8

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

Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41
This commit is contained in:
Dan Willemsen
2016-05-31 22:20:19 +00:00
committed by android-build-merger
parent 1d7930b2be fcaae6bee8
commit 99e2c216b4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/prebuilt.mk
View File

@@ -13,8 +13,11 @@ 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