diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/module.go b/android/module.go index 37e26f9b8..39c257c2a 100644 --- a/android/module.go +++ b/android/module.go @@ -389,7 +389,7 @@ type commonProperties struct { Init_rc []string `android:"arch_variant,path"` // VINTF manifest fragments to be installed if this module is installed - Vintf_fragments []string `android:"path"` + Vintf_fragments proptools.Configurable[[]string] `android:"path"` // names of other modules to install if this module is installed Required proptools.Configurable[[]string] `android:"arch_variant"` @@ -1853,7 +1853,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) } } - m.vintfFragmentsPaths = PathsForModuleSrc(ctx, m.commonProperties.Vintf_fragments) + m.vintfFragmentsPaths = PathsForModuleSrc(ctx, m.commonProperties.Vintf_fragments.GetOrDefault(m.ConfigurableEvaluator(ctx), nil)) vintfDir := PathForModuleInstall(ctx, "etc", "vintf", "manifest") for _, src := range m.vintfFragmentsPaths { installedVintfFragment := vintfDir.Join(ctx, src.Base()) |