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

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

Change-Id: I49ddf54d1edbd5a921da6df6060988f2126159cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Trevor Radcliffe 2022-04-05 15:54:59 +00:00 committed by Automerger Merge Worker
commit 0eaf156a31

View file

@ -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