diff options
| author | 2024-07-11 01:24:10 +0000 | |
|---|---|---|
| committer | 2024-07-11 01:24:10 +0000 | |
| commit | 256772f02c96cedbad1d1d135f55f48b33bf9afc (patch) | |
| tree | ad8cf69cd4817730cc2ffe72b25ee8091c50d3bc /java/aar.go | |
| parent | 05f3927c090e32ab2ff4260f1e2d847dfef13a9a (diff) | |
| parent | 9f7b9f4a9ab77d1816e8ae30ac8339e335fb7e92 (diff) | |
Merge "Use OutputFilesProvider on java modules" into main
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/java/aar.go b/java/aar.go index 4aae62a45..2f49a959d 100644 --- a/java/aar.go +++ b/java/aar.go @@ -798,18 +798,6 @@ type AndroidLibrary struct { aarFile android.WritablePath } -var _ android.OutputFileProducer = (*AndroidLibrary)(nil) - -// For OutputFileProducer interface -func (a *AndroidLibrary) OutputFiles(tag string) (android.Paths, error) { - switch tag { - case ".aar": - return []android.Path{a.aarFile}, nil - default: - return a.Library.OutputFiles(tag) - } -} - var _ AndroidLibraryDependency = (*AndroidLibrary)(nil) func (a *AndroidLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -911,6 +899,13 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) android.SetProvider(ctx, FlagsPackagesProvider, FlagsPackages{ AconfigTextFiles: aconfigTextFilePaths, }) + + a.setOutputFiles(ctx) +} + +func (a *AndroidLibrary) setOutputFiles(ctx android.ModuleContext) { + ctx.SetOutputFiles([]android.Path{a.aarFile}, ".aar") + setOutputFiles(ctx, a.Library.Module) } func (a *AndroidLibrary) IDEInfo(dpInfo *android.IdeInfo) { |