summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-03-20 10:39:57 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-20 10:39:57 -0700
commitc20ea4c09f447870f7c0506a15634765fd3f377a (patch)
tree2c789bc5bf0512d964fad74edd6781c1d2200f4c /java/java.go
parentcecf06a088b08c8d4ccb4d22be42548840aacdae (diff)
parentd62bfe5604635d0b98746b33ffd080600d91c6b7 (diff)
Merge "Support package_splits"
am: d62bfe5604 Change-Id: Idf4f63ea566e22353430994465ecaaedd27d7bb2
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 {