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

Commit b2b968ec authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Automerger Merge Worker
Browse files

Merge "Make changes to support test_suites for test lib" am: f190db2a am:... 

Merge "Make changes to support test_suites for test lib" am: f190db2a am: 0eaf156a am: 0cbaeda1

Original change: https://android-review.googlesource.com/c/platform/build/+/2051889



Change-Id: I66bb26bb21ea928b28e5f52026b56fb43606bfa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6519003 0cbaeda1

core/base_rules.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -713,6 +713,10 @@ ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS) 
endif

endif

ifdef LOCAL_MULTILIB

ifdef LOCAL_MULTILIB

  multi_arch := true

  multi_arch := true

else ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

    multi_arch := true

  endif

endif

endif





ifdef multi_arch

ifdef multi_arch