From 555d133433fef7a9c2eb1420efce05398f13018d Mon Sep 17 00:00:00 2001 From: mrziwang Date: Fri, 7 Jun 2024 11:15:33 -0700 Subject: Use OutputFilesProvider on filesystem module types Test: CI Bug: 339477385 Change-Id: I0902726cfef13c716d73c1abc5c9836bdcf3e10f --- filesystem/logical_partition.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'filesystem/logical_partition.go') diff --git a/filesystem/logical_partition.go b/filesystem/logical_partition.go index e2f7d7bdf..e483fe472 100644 --- a/filesystem/logical_partition.go +++ b/filesystem/logical_partition.go @@ -185,6 +185,8 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext l.installDir = android.PathForModuleInstall(ctx, "etc") ctx.InstallFile(l.installDir, l.installFileName(), l.output) + + ctx.SetOutputFiles([]android.Path{l.output}, "") } // Add a rule that converts the filesystem for the given partition to the given rule builder. The @@ -231,13 +233,3 @@ func (l *logicalPartition) OutputPath() android.Path { func (l *logicalPartition) SignedOutputPath() android.Path { return nil // logical partition is not signed by itself } - -var _ android.OutputFileProducer = (*logicalPartition)(nil) - -// Implements android.OutputFileProducer -func (l *logicalPartition) OutputFiles(tag string) (android.Paths, error) { - if tag == "" { - return []android.Path{l.output}, nil - } - return nil, fmt.Errorf("unsupported module reference tag %q", tag) -} -- cgit v1.2.3-59-g8ed1b