From 8937176646fc0b75133b6dbc8e6baf5a56875a4f Mon Sep 17 00:00:00 2001 From: mrziwang Date: Tue, 11 Jun 2024 12:42:24 -0700 Subject: [PATCH] Use OutputFilesProvider on prebuilt_etc In the context of incremental soong, the output files inter-module-communication will be through OutputFilesProvider. The OutputFileProducer interface will be deprecated. Test: CI Bug: 339477385 Change-Id: Ibd64f7e526f39a067ce395b32b87d3fdb117a573 --- etc/prebuilt_etc.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index c1a0b9c60..c17594b8d 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -268,17 +268,6 @@ func (p *PrebuiltEtc) OutputFile() android.OutputPath { return p.outputFilePaths[0] } -var _ android.OutputFileProducer = (*PrebuiltEtc)(nil) - -func (p *PrebuiltEtc) OutputFiles(tag string) (android.Paths, error) { - switch tag { - case "": - return p.outputFilePaths.Paths(), nil - default: - return nil, fmt.Errorf("unsupported module reference tag %q", tag) - } -} - func (p *PrebuiltEtc) SubDir() string { if subDir := proptools.String(p.subdirProperties.Sub_dir); subDir != "" { return subDir @@ -420,6 +409,8 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) { for _, ip := range installs { ip.addInstallRules(ctx) } + + ctx.SetOutputFiles(p.outputFilePaths.Paths(), "") } type installProperties struct {