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

Make the vintf_fragments property configurable

Browse Source 
This allows using select statements with it.

Bug: 354824866
Test: m
Change-Id: I9080c14b8342868d842670c65386582552b32d46
This commit is contained in:
Inseob Kim
2024-07-23 13:36:31 +09:00
parent f4889dbc88
commit f223702f3f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/module.go
View File

@@ -389,7 +389,7 @@ type commonProperties struct {
Init_rc []string `android:"arch_variant,path"` Init_rc []string `android:"arch_variant,path"`
// VINTF manifest fragments to be installed if this module is installed // 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 // names of other modules to install if this module is installed
Required proptools.Configurable[[]string] `android:"arch_variant"` 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") vintfDir := PathForModuleInstall(ctx, "etc", "vintf", "manifest")
for _, src := range m.vintfFragmentsPaths { for _, src := range m.vintfFragmentsPaths {
installedVintfFragment := vintfDir.Join(ctx, src.Base()) installedVintfFragment := vintfDir.Join(ctx, src.Base())