Allow Multilib in override_apex
Test: m nothing --no-skip-soong-tests Test: go test apex_text.go Bug: 246854990 Change-Id: Id6e31c63acd87466a4436288d550ce6b298c677d
This commit is contained in:
@@ -358,6 +358,8 @@ type overridableProperties struct {
|
||||
// be removed from PRODUCT_PACKAGES.
|
||||
Overrides []string
|
||||
|
||||
Multilib apexMultilibProperties
|
||||
|
||||
// Logging parent value.
|
||||
Logging_parent string
|
||||
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user