diff options
| author | 2024-06-10 15:09:45 -0700 | |
|---|---|---|
| committer | 2024-06-10 15:17:07 -0700 | |
| commit | e2346b87d9bf3c3b94fcbc4a613e8ce7c35550b6 (patch) | |
| tree | cebd648329269d804c09e5bfde69f7689f7f8bcb /java | |
| 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 'java')
| -rw-r--r-- | java/sdk_library.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 6c1a38d7d..e9fa83ae7 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -3252,11 +3252,6 @@ func (module *sdkLibraryXml) SubDir() string { return "permissions" } -// from android.PrebuiltEtcModule -func (module *sdkLibraryXml) OutputFiles(tag string) (android.Paths, error) { - return android.OutputPaths{module.outputFilePath}.Paths(), nil -} - var _ etc.PrebuiltEtcModule = (*sdkLibraryXml)(nil) // from android.ApexModule @@ -3400,6 +3395,8 @@ func (module *sdkLibraryXml) GenerateAndroidBuildActions(ctx android.ModuleConte module.installDirPath = android.PathForModuleInstall(ctx, "etc", module.SubDir()) ctx.PackageFile(module.installDirPath, libName+".xml", module.outputFilePath) + + ctx.SetOutputFiles(android.OutputPaths{module.outputFilePath}.Paths(), "") } func (module *sdkLibraryXml) AndroidMkEntries() []android.AndroidMkEntries { |