Add vintf_fragment modules as required dependencies
vint_fragment modules are automatically added as required dependencies
in Androidmk entries generation, but is not being added as Soong
required install dependencies. This change allows the vint_fragment
modules to be automatically installed, matching the behavior in make.
Test: unpack and diff soong and make generated vendor_ramdisk partitions
Bug: 322089980
Bug: 381888358
Change-Id: I697b32c9dacec7a35f9fca62bedae1d3e563568e
diff --git a/android/module.go b/android/module.go
index 72dba04..b8f2cae 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1049,7 +1049,7 @@
hostTargets = append(hostTargets, ctx.Config().BuildOSCommonTarget)
if ctx.Device() {
- for _, depName := range ctx.Module().RequiredModuleNames(ctx) {
+ for _, depName := range append(ctx.Module().RequiredModuleNames(ctx), ctx.Module().VintfFragmentModuleNames(ctx)...) {
for _, target := range deviceTargets {
addDep(target, depName)
}
@@ -1062,7 +1062,7 @@
}
if ctx.Host() {
- for _, depName := range ctx.Module().RequiredModuleNames(ctx) {
+ for _, depName := range append(ctx.Module().RequiredModuleNames(ctx), ctx.Module().VintfFragmentModuleNames(ctx)...) {
for _, target := range hostTargets {
// When a host module requires another host module, don't make a
// dependency if they have different OSes (i.e. hostcross).