Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a55b1c6 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6be 

am: 99e2c216

* commit '99e2c216':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
parents eaa4ef4c 99e2c216

core/prebuilt.mk

+4 −1
Original line number Diff line number Diff line
@@ -13,9 +13,12 @@ else 
  my_prefix := TARGET_



  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

    endif

  endif

endif



include $(BUILD_SYSTEM)/multilib.mk