diff options
| author | 2024-06-10 15:09:45 -0700 | |
|---|---|---|
| committer | 2024-06-10 15:17:07 -0700 | |
| commit | e2346b87d9bf3c3b94fcbc4a613e8ce7c35550b6 (patch) | |
| tree | cebd648329269d804c09e5bfde69f7689f7f8bcb /apex/apex.go | |
| 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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index e79afadc1..4c97fdb80 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2128,7 +2128,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, } case prebuiltTag: if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok { - filesToCopy, _ := prebuilt.OutputFiles("") + filesToCopy := android.OutputFilesForModule(ctx, prebuilt, "") for _, etcFile := range filesToCopy { vctx.filesInfo = append(vctx.filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, etcFile)) } @@ -2274,7 +2274,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, // Because APK-in-APEX embeds jni_libs transitively, we don't need to track transitive deps } else if java.IsXmlPermissionsFileDepTag(depTag) { if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok { - filesToCopy, _ := prebuilt.OutputFiles("") + filesToCopy := android.OutputFilesForModule(ctx, prebuilt, "") for _, etcFile := range filesToCopy { vctx.filesInfo = append(vctx.filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, etcFile)) } |