diff options
| author | 2024-11-27 00:50:30 +0000 | |
|---|---|---|
| committer | 2024-11-27 00:50:30 +0000 | |
| commit | 23be5bb233c2fc118e8e58b59e8875bef289e771 (patch) | |
| tree | 492ddee95ad349f701ffb7f0c7fcbfb96f6c2dff /android/module.go | |
| parent | 6dbff039219e5186db651968ed924412005e5a0a (diff) | |
Reland^2 : Do not allow vintf_fragments for modules installed in the filesystem"
Soong defined filesystem does not have any logic to handle
vintf_fragments items, so those item should be used with vintf_fragment
modules instead. This change checks if there is any module installed in
the Soong defined filesystem and defines vintf_fragments property, and
raises error for those modules.
Bug: 322089980
Change-Id: Idd4c406c90571a07ff2cabd5629073d338af795c
Test: There is no diff between vintf manifests of generic_system_image and aosp_cf_x86_64_phone
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index ce995ad77..686a90ef0 100644 --- a/android/module.go +++ b/android/module.go @@ -117,6 +117,7 @@ type Module interface { HostRequiredModuleNames() []string TargetRequiredModuleNames() []string VintfFragmentModuleNames(ctx ConfigurableEvaluatorContext) []string + VintfFragments(ctx ConfigurableEvaluatorContext) []string ConfigurableEvaluator(ctx ConfigurableEvaluatorContext) proptools.ConfigurableEvaluator @@ -1626,6 +1627,10 @@ func (m *ModuleBase) VintfFragmentModuleNames(ctx ConfigurableEvaluatorContext) return m.base().commonProperties.Vintf_fragment_modules.GetOrDefault(m.ConfigurableEvaluator(ctx), nil) } +func (m *ModuleBase) VintfFragments(ctx ConfigurableEvaluatorContext) []string { + return m.base().commonProperties.Vintf_fragments.GetOrDefault(m.ConfigurableEvaluator(ctx), nil) +} + func (m *ModuleBase) generateVariantTarget(ctx *moduleContext) { namespacePrefix := ctx.Namespace().id if namespacePrefix != "" { |