StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow Multilib in override_apex" into main am: 219ce55481

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3019828

Change-Id: I534b3d93ca349fe30847111ac6f6c5afdd80249e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jesse Melhuish
2024-04-01 14:37:39 +00:00
committed by Automerger Merge Worker
parent b468b6db7b 219ce55481
commit 7dadc453d4
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -358,6 +358,8 @@ type overridableProperties struct {
// be removed from PRODUCT_PACKAGES. // be removed from PRODUCT_PACKAGES.
Overrides []string Overrides []string
Multilib apexMultilibProperties
// Logging parent value. // Logging parent value.
Logging_parent string Logging_parent string

19
apex/apex_test.go
View File

@@ -6939,6 +6939,15 @@ func TestOverrideApex(t *testing.T) {
bpfs: ["overrideBpf"], bpfs: ["overrideBpf"],
prebuilts: ["override_myetc"], prebuilts: ["override_myetc"],
overrides: ["unknownapex"], overrides: ["unknownapex"],
compile_multilib: "first",
multilib: {
lib32: {
native_shared_libs: ["mylib32"],
},
lib64: {
native_shared_libs: ["mylib64"],
},
},
logging_parent: "com.foo.bar", logging_parent: "com.foo.bar",
package_name: "test.overridden.package", package_name: "test.overridden.package",
key: "mynewapex.key", key: "mynewapex.key",
@@ -6996,6 +7005,16 @@ func TestOverrideApex(t *testing.T) {
name: "override_myetc", name: "override_myetc",
src: "override_myprebuilt", src: "override_myprebuilt",
} }
cc_library {
name: "mylib32",
apex_available: [ "myapex" ],
}
cc_library {
name: "mylib64",
apex_available: [ "myapex" ],
}
`, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"})) `, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"}))
originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex").Module().(android.OverridableModule) originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex").Module().(android.OverridableModule)