summaryrefslogtreecommitdiff
path: root/java/sdk_library.go
diff options
context:
space:
mode:
author ThiƩbaud Weksteen <tweek@google.com> 2024-03-21 23:14:48 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-03-21 23:14:48 +0000
commitd3348dbaaa374ab69bedc081a64209e1c0bb886c (patch)
tree61104f8a7bf593de4cca2f89b07276cd7243bcd5 /java/sdk_library.go
parent7f752454029851ea95b8b758a2fdb6a278a86ac5 (diff)
parent00e8b31ee6a20ef5301b9dad3715a7bf8bc5c088 (diff)
Merge "Support multiple sources for prebuilt_etc" into main
Diffstat (limited to 'java/sdk_library.go')
-rw-r--r--java/sdk_library.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 7f49871e9..5ddc6751c 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -30,6 +30,7 @@ import (
"android/soong/android"
"android/soong/dexpreopt"
+ "android/soong/etc"
)
const (
@@ -3174,10 +3175,12 @@ func (module *sdkLibraryXml) SubDir() string {
}
// from android.PrebuiltEtcModule
-func (module *sdkLibraryXml) OutputFile() android.OutputPath {
- return module.outputFilePath
+func (module *sdkLibraryXml) OutputFiles(tag string) (android.Paths, error) {
+ return android.OutputPaths{module.outputFilePath}.Paths(), nil
}
+var _ etc.PrebuiltEtcModule = (*sdkLibraryXml)(nil)
+
// from android.ApexModule
func (module *sdkLibraryXml) AvailableFor(what string) bool {
return true