Merge "Make changes to support test_suites for test lib"

2022-04-05 15:34:53 +00:00
parent 229fb33e39 74a4de735b
commit f190db2a0c
1 changed files with 4 additions and 0 deletions
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -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