From 00e8b31ee6a20ef5301b9dad3715a7bf8bc5c088 Mon Sep 17 00:00:00 2001 From: Thiébaud Weksteen Date: Mon, 18 Mar 2024 14:06:00 +1100 Subject: Support multiple sources for prebuilt_etc Keep the Src attribute for compatibility. The new attribute (Srcs) is mutually exclusive with Src. Keep SourceFilePath and OutputFile for compatibility with other modules. These can be removed in a follow up change. Bug: 328313691 Test: presubmit Test: m blueprint_tests Test: prebuilts/build-tools/build-prebuilts.sh (on build-tools branch) Change-Id: I5d5b2657715a7180a829c7ed0f501872d561b662 --- java/sdk_library.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index cdd04483d..98e1e37c9 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 ( @@ -3163,10 +3164,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 -- cgit v1.2.3-59-g8ed1b