diff options
| author | 2019-03-20 10:43:35 -0700 | |
|---|---|---|
| committer | 2019-03-20 10:43:35 -0700 | |
| commit | 58350d8d336b042b71923a0572b88d0af1a38669 (patch) | |
| tree | 2c789bc5bf0512d964fad74edd6781c1d2200f4c /java/java.go | |
| parent | 637c287938485328302f8d5478542c55eca78961 (diff) | |
| parent | c20ea4c09f447870f7c0506a15634765fd3f377a (diff) | |
Merge "Support package_splits" am: d62bfe5604
am: c20ea4c09f
Change-Id: I8d9db09c1e451a468ef73cfdf8ad5f025aaeb1a3
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
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 { |