summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-03-20 10:49:05 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-20 10:49:05 -0700
commit11cdb3202bd33239574730d77f937ff6d489f879 (patch)
tree01167c290837f1ce6b24a6c57b8a5b2cdda1ef3c /java/java.go
parent1aad9078a234c8249190a167ff0be796e154824e (diff)
parent58350d8d336b042b71923a0572b88d0af1a38669 (diff)
Merge "Support package_splits" am: d62bfe5604 am: c20ea4c09f
am: 58350d8d33 Change-Id: I727b1cb34b5a808f48b399d6ad938f7a993f3229
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go
index dcd6dbe93..f088d8647 100644
--- a/java/java.go
+++ b/java/java.go
@@ -288,7 +288,8 @@ type Module struct {
proguardDictionary android.Path
// output file of the module, which may be a classes jar or a dex jar
- outputFile android.Path
+ outputFile android.Path
+ extraOutputFiles android.Paths
exportAidlIncludeDirs android.Paths
@@ -322,7 +323,7 @@ type Module struct {
}
func (j *Module) Srcs() android.Paths {
- return android.Paths{j.outputFile}
+ return append(android.Paths{j.outputFile}, j.extraOutputFiles...)
}
func (j *Module) DexJarFile() android.Path {