From 23be5bb233c2fc118e8e58b59e8875bef289e771 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 27 Nov 2024 00:50:30 +0000 Subject: 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 --- filesystem/system_image.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'filesystem/system_image.go') diff --git a/filesystem/system_image.go b/filesystem/system_image.go index d03eab45b..60a513346 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -63,3 +63,7 @@ func (s *systemImage) FilterPackagingSpec(ps android.PackagingSpec) bool { (ps.Partition() == "system" || ps.Partition() == "root" || strings.HasPrefix(ps.Partition(), "system/")) } + +func (s *systemImage) ShouldUseVintfFragmentModuleOnly() bool { + return true +} -- cgit v1.2.3-59-g8ed1b