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

Merge "Add {.aar} support for android_library" am: db3ff57368 am: 7b3130a459 am: 7181c70efb am: bc1de88b71

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

Change-Id: Id7701d97ae027b0585c120f58a801b237e089f42
This commit is contained in:
Treehugger Robot
2021-09-15 00:57:49 +00:00
committed by Automerger Merge Worker
parent 4ebe5aee4a bc1de88b71
commit 8cbe142522
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/aar.go
View File

@@ -486,6 +486,18 @@ type AndroidLibrary struct {
exportedStaticPackages android.Paths exportedStaticPackages android.Paths
} }
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)
}
}
func (a *AndroidLibrary) ExportedProguardFlagFiles() android.Paths { func (a *AndroidLibrary) ExportedProguardFlagFiles() android.Paths {
return a.exportedProguardFlagFiles return a.exportedProguardFlagFiles
} }