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

Commit 5a204d1d authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST" 

am: d52953e9

* commit 'd52953e9':
  Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
parents 42c42b69 d52953e9

core/host_native_test.mk

+18 −0
Original line number Diff line number Diff line
@@ -5,4 +5,22 @@ 


include $(BUILD_SYSTEM)/host_test_internal.mk



needs_symlink :=

ifndef LOCAL_MULTILIB

  ifndef LOCAL_32_BIT_ONLY

    LOCAL_MULTILIB := both



    ifeq (,$(LOCAL_MODULE_STEM_32)$(LOCAL_MODULE_STEM_64))

      LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32

      LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

      needs_symlink := true

    endif

  endif

endif



include $(BUILD_HOST_EXECUTABLE)



ifdef needs_symlink

include $(BUILD_SYSTEM)/executable_prefer_symlink.mk

needs_symlink :=

endif