Merge tag 'LA.QSSI.12.0.r1-07100.01-qssi.0' into sugisawa-mr1

"LA.QSSI.12.0.r1-07100.01-qssi.0"

Change-Id: Id8574091781260a4fd53ec02dc902e2f6dd5cf28

1 files changed, 12 insertions, 0 deletions

diff --git a/java/aar.go b/java/aar.go
index 04727e4b9..a5cf0fd70 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -486,6 +486,18 @@ type AndroidLibrary struct {
 	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 {
 	return a.exportedProguardFlagFiles
 }