Merge "Make changes to support test_suites for test lib"

This commit is contained in:
Trevor Radcliffe 2022-04-05 15:34:53 +00:00 committed by Gerrit Code Review
commit f190db2a0c
1 changed files with 4 additions and 0 deletions

View File

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