summaryrefslogtreecommitdiff
path: root/java/app.go
diff options
context:
space:
mode:
Diffstat (limited to 'java/app.go')
-rwxr-xr-xjava/app.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go
index 3e26a39a2..e277aed55 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1022,7 +1022,13 @@ func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) {
case ".aapt.proguardOptionsFile":
return []android.Path{a.proguardOptionsFile}, nil
case ".aapt.srcjar":
- return []android.Path{a.aaptSrcJar}, nil
+ if a.aaptSrcJar != nil {
+ return []android.Path{a.aaptSrcJar}, nil
+ }
+ case ".aapt.jar":
+ if a.rJar != nil {
+ return []android.Path{a.rJar}, nil
+ }
case ".export-package.apk":
return []android.Path{a.exportPackage}, nil
}