commit 74a4de735b4f4024fe9891d361da8f50df5b0c40
author Trevor Radcliffe <tradical@google.com> Wed Mar 30 16:46:32 2022 +0000
committer Trevor Radcliffe <tradical@google.com> Thu Mar 31 18:15:58 2022 +0000
tree 8b7ff4c20eff64f2eae481229cace14bf0ce1ecd
parent 4a723d0ecf16e075bc5ff79d456f3d78c2149ef1

Make changes to support test_suites for test lib

Had to make changes to make to ensure that we don't duplicate

Bug: 226402757
Test: Confirmed that libraries are installed to the correct place
Change-Id: I64e4a5ab7cac3fb57442d19b0f796fffb0a3f48a

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c01cde8..e6b8f20 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -713,6 +713,10 @@
 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