From ec60e25a1cb92b2ca21ba3efdfe3ead5d26fe4e8 Mon Sep 17 00:00:00 2001
From: Jesse Melhuish <melhuishj@google.com>
Date: Fri, 29 Mar 2024 19:08:20 +0000
Subject: [PATCH] Allow Multilib in override_apex

Test: m nothing --no-skip-soong-tests
Test: go test apex_text.go
Bug: 246854990
Change-Id: Id6e31c63acd87466a4436288d550ce6b298c677d
---
 apex/apex.go      |  2 ++
 apex/apex_test.go | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/apex/apex.go b/apex/apex.go
index bc91407a7..8d2979e8d 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -358,6 +358,8 @@ type overridableProperties struct {
 	// be removed from PRODUCT_PACKAGES.
 	Overrides []string
 
+	Multilib apexMultilibProperties
+
 	// Logging parent value.
 	Logging_parent string
 
diff --git a/apex/apex_test.go b/apex/apex_test.go
index b7362b202..65a4ec71b 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -7334,6 +7334,15 @@ func TestOverrideApex(t *testing.T) {
 			bpfs: ["overrideBpf"],
 			prebuilts: ["override_myetc"],
 			overrides: ["unknownapex"],
+			compile_multilib: "first",
+			multilib: {
+				lib32: {
+					native_shared_libs: ["mylib32"],
+				},
+				lib64: {
+					native_shared_libs: ["mylib64"],
+				},
+			},
 			logging_parent: "com.foo.bar",
 			package_name: "test.overridden.package",
 			key: "mynewapex.key",
@@ -7391,6 +7400,16 @@ func TestOverrideApex(t *testing.T) {
 			name: "override_myetc",
 			src: "override_myprebuilt",
 		}
+
+		cc_library {
+			name: "mylib32",
+			apex_available: [ "myapex" ],
+		}
+
+		cc_library {
+			name: "mylib64",
+			apex_available: [ "myapex" ],
+		}
 	`, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"}))
 
 	originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex").Module().(android.OverridableModule)