From 3cc3ca4d62117a20d8e136c6df1d3165c64b2be4 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Tue, 23 Jul 2024 13:36:31 +0900 Subject: [PATCH] Make the vintf_fragments property configurable This allows using select statements with it. Bug: 354824866 Test: m Change-Id: I9080c14b8342868d842670c65386582552b32d46 --- android/module.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/module.go b/android/module.go index df410573f..05e7f6372 100644 --- a/android/module.go +++ b/android/module.go @@ -419,7 +419,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"` @@ -1881,7 +1881,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())