From d5df518597aaa1a7e7d8ad44c854c1e4e73dc05d Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Tue, 11 Feb 2025 18:28:53 +0900 Subject: Soong filesystem generates aconfig files for subpartitions When system had system_ext or other subpartitions, aconfig files for the subpartitions were missing. Generate those aconfig files for the subpartitions. With this fix, we don't need to import aconfig files from system_ext to generate system aconfig files. Bug: 385213580 Test: lunch gsi_x86_64-trunk_staging-userdebug && m Change-Id: Ie3db5c73c50af97f3ad0bea5e0c84273c9fce886 --- filesystem/filesystem.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index d4ea6a34c..0a3b39cb4 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -208,11 +208,6 @@ type FilesystemProperties struct { // Install aconfig_flags.pb file for the modules installed in this partition. Gen_aconfig_flags_pb *bool - // List of names of other filesystem partitions to import their aconfig flags from. - // This is used for the system partition to import system_ext's aconfig flags, as currently - // those are considered one "container": aosp/3261300 - Import_aconfig_flags_from []string - Fsverity fsverityProperties // If this property is set to true, the filesystem will call ctx.UncheckedModule(), causing @@ -359,9 +354,6 @@ func (f *filesystem) DepsMutator(ctx android.BottomUpMutatorContext) { if f.properties.Android_filesystem_deps.System_ext != nil { ctx.AddDependency(ctx.Module(), interPartitionDependencyTag, proptools.String(f.properties.Android_filesystem_deps.System_ext)) } - for _, partition := range f.properties.Import_aconfig_flags_from { - ctx.AddDependency(ctx.Module(), importAconfigDependencyTag, partition) - } for _, partition := range f.properties.Include_files_of { ctx.AddDependency(ctx.Module(), interPartitionInstallDependencyTag, partition) } -- cgit v1.2.3-59-g8ed1b