diff options
| author | 2024-11-20 04:34:34 +0000 | |
|---|---|---|
| committer | 2024-11-20 04:34:34 +0000 | |
| commit | df17e7b6c3c7d26efab1ec9fbcffdf16c325a229 (patch) | |
| tree | 492ddee95ad349f701ffb7f0c7fcbfb96f6c2dff /android/module.go | |
| parent | e3a84fe7d64d6a96f656674cec93f72874f8f40c (diff) | |
Reland: 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: I6b21da631bb2f807afe9d88a1a8e892fde23509a
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 != "" { |