StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use OutputFilesProvider on aconfig_declarations_group" into main am: 8f3fd0a049 am: 2d92d1dc3a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3126616

Change-Id: I3b4ae3de38159917a3940ffb60894268fb511d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2024-06-14 00:27:57 +00:00
committed by Automerger Merge Worker
parent 3474465b17 2d92d1dc3a
commit 58b583f64d
3 changed files with 2 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
aconfig/codegen/aconfig_declarations_group.go
View File

@@ -15,7 +15,6 @@
package codegen
import (
"fmt"
"maps"
"android/soong/android"
@@ -115,19 +114,9 @@ func (adg *AconfigDeclarationsGroup) GenerateAndroidBuildActions(ctx android.Mod
Srcjars: adg.javaSrcjars,
ModeInfos: adg.modeInfos,
})
}
var _ android.OutputFileProducer = (*AconfigDeclarationsGroup)(nil)
func (adg *AconfigDeclarationsGroup) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return adg.intermediateCacheOutputPaths, nil
case ".srcjars":
return adg.javaSrcjars, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %s", tag)
}
ctx.SetOutputFiles(adg.intermediateCacheOutputPaths, "")
ctx.SetOutputFiles(adg.javaSrcjars, ".srcjars")
}
func (adg *AconfigDeclarationsGroup) Srcjars() android.Paths {