From 74a4de735b4f4024fe9891d361da8f50df5b0c40 Mon Sep 17 00:00:00 2001
From: Trevor Radcliffe <tradical@google.com>
Date: Wed, 30 Mar 2022 16:46:32 +0000
Subject: [PATCH] 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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c01cde8e9e..e6b8f20785 100644
--- 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