From 7f9bcd00bef48fb4c2cfa14116bea86e66129bcb Mon Sep 17 00:00:00 2001 From: "PODISHETTY KUMAR (xWF)" Date: Fri, 4 Oct 2024 07:39:10 +0000 Subject: Revert "Create soong-generated filesystem diff test" This reverts commit 2cf1bf5624c8048b960b9e0ec27a7677739049ae. Reason for revert: Change-Id: Ie9d0e279a3fa6de71427c0f7f9c95990e59c8a6d --- filesystem/filesystem.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 14501bb66..a26fac7fc 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -35,7 +35,7 @@ func init() { } func registerBuildComponents(ctx android.RegistrationContext) { - ctx.RegisterModuleType("android_filesystem", FilesystemFactory) + ctx.RegisterModuleType("android_filesystem", filesystemFactory) ctx.RegisterModuleType("android_filesystem_defaults", filesystemDefaultsFactory) ctx.RegisterModuleType("android_system_image", SystemImageFactory) ctx.RegisterModuleType("avb_add_hash_footer", avbAddHashFooterFactory) @@ -144,7 +144,7 @@ type FilesystemProperties struct { // modules in the filesystem image are built for the target device (i.e. Android, not Linux host). // The modules are placed in the filesystem image just like they are installed to the ordinary // partitions like system.img. For example, cc_library modules are placed under ./lib[64] directory. -func FilesystemFactory() android.Module { +func filesystemFactory() android.Module { module := &filesystem{} module.filterPackagingSpec = module.filterInstallablePackagingSpec initFilesystemModule(module, module) @@ -177,13 +177,6 @@ const ( unknown ) -type FilesystemInfo struct { - // A text file containing the list of paths installed on the partition. - FileListFile android.Path -} - -var FilesystemProvider = blueprint.NewProvider[FilesystemInfo]() - func (f *filesystem) fsType(ctx android.ModuleContext) fsType { typeStr := proptools.StringDefault(f.properties.Type, "ext4") switch typeStr { @@ -234,10 +227,6 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { f.fileListFile = android.PathForModuleOut(ctx, "fileList").OutputPath android.WriteFileRule(ctx, f.fileListFile, f.installedFilesList()) - - android.SetProvider(ctx, FilesystemProvider, FilesystemInfo{ - FileListFile: f.fileListFile, - }) } func (f *filesystem) appendToEntry(ctx android.ModuleContext, installedFile android.OutputPath) { -- cgit v1.2.3-59-g8ed1b