From df17e7b6c3c7d26efab1ec9fbcffdf16c325a229 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 20 Nov 2024 04:34:34 +0000 Subject: 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 --- android/module_proxy.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'android/module_proxy.go') diff --git a/android/module_proxy.go b/android/module_proxy.go index 1f9679926..30459b9cd 100644 --- a/android/module_proxy.go +++ b/android/module_proxy.go @@ -9,6 +9,8 @@ type ModuleProxy struct { module blueprint.ModuleProxy } +var _ Module = (*ModuleProxy)(nil) + func (m ModuleProxy) Name() string { return m.module.Name() } @@ -225,3 +227,7 @@ func (m ModuleProxy) DecodeMultilib(ctx ConfigContext) (string, string) { func (m ModuleProxy) Overrides() []string { panic("method is not implemented on ModuleProxy") } + +func (m ModuleProxy) VintfFragments(ctx ConfigurableEvaluatorContext) []string { + panic("method is not implemented on ModuleProxy") +} -- cgit v1.2.3-59-g8ed1b