Merge "Add a tagged output for app's exportPackage"
diff --git a/java/app.go b/java/app.go
index e820048..fd84223 100755
--- a/java/app.go
+++ b/java/app.go
@@ -963,6 +963,8 @@
 	switch tag {
 	case ".aapt.srcjar":
 		return []android.Path{a.aaptSrcJar}, nil
+	case ".export-package.apk":
+		return []android.Path{a.exportPackage}, nil
 	}
 	return a.Library.OutputFiles(tag)
 }