diff options
| author | 2024-06-10 15:09:45 -0700 | |
|---|---|---|
| committer | 2024-06-10 15:17:07 -0700 | |
| commit | e2346b87d9bf3c3b94fcbc4a613e8ce7c35550b6 (patch) | |
| tree | cebd648329269d804c09e5bfde69f7689f7f8bcb /linkerconfig | |
| parent | 0030148fcbc83715d51f9e1fc901f08ff875a2d0 (diff) | |
PrebuildEtcModule no longer implements OutputFiles method
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.
These module types are included in this change:
linker_config
llndk_libraries_txt
sanitizer_libraries_txt
java_sdk_library_xml
vndksp_libraries_txt
vndkcore_libraries_txt
vndkprivate_libraries_txt
vndkpublic_libraries_txt
Test: CI
Bug: 339477385
Change-Id: I35575bbad137df5ff8001db9a61ba5b3d13eaa6d
Diffstat (limited to 'linkerconfig')
| -rw-r--r-- | linkerconfig/linkerconfig.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/linkerconfig/linkerconfig.go b/linkerconfig/linkerconfig.go index 98aa40805..3a8d3cfe3 100644 --- a/linkerconfig/linkerconfig.go +++ b/linkerconfig/linkerconfig.go @@ -15,7 +15,6 @@ package linkerconfig import ( - "fmt" "sort" "strings" @@ -73,17 +72,6 @@ func (l *linkerConfig) OutputFile() android.OutputPath { return l.outputFilePath } -var _ android.OutputFileProducer = (*linkerConfig)(nil) - -func (l *linkerConfig) OutputFiles(tag string) (android.Paths, error) { - switch tag { - case "": - return android.Paths{l.outputFilePath}, nil - default: - return nil, fmt.Errorf("unsupported module reference tag %q", tag) - } -} - func (l *linkerConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) { input := android.PathForModuleSrc(ctx, android.String(l.properties.Src)) output := android.PathForModuleOut(ctx, "linker.config.pb").OutputPath @@ -98,6 +86,8 @@ func (l *linkerConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) { l.SkipInstall() } ctx.InstallFile(l.installDirPath, l.outputFilePath.Base(), l.outputFilePath) + + ctx.SetOutputFiles(android.Paths{l.outputFilePath}, "") } func BuildLinkerConfig(ctx android.ModuleContext, builder *android.RuleBuilder, |