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 --- 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