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

Commit 29bc4079 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 am: b2b968ec am: 8cb4e301

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



Change-Id: I6827f8b3adab543a4e84ede80d1bd1367f13f1e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 334dcbb0 8cb4e301

core/base_rules.mk

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

ifdef LOCAL_MULTILIB

  multi_arch := true

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

  ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

    multi_arch := true

  endif

endif



ifdef multi_arch