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 67bb55e0f..eacbcebca 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -6939,6 +6939,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", @@ -6996,6 +7005,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)