diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-13 20:21:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-13 20:21:47 +0000 |
| commit | f3e802bf0df27a7af9da285439108d5eff1e9a84 (patch) | |
| tree | f4fd77cc0a4efff970bc524efaca0504042cfa4d /java/java.go | |
| parent | 95aabdad9cda7decb78acba66723803435eb7062 (diff) | |
| parent | 6c6e6cd64d7754a988c2a4172010dce4e39cadd0 (diff) | |
Merge "Don't hide *.kotlin_module in turbine dependencies"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 01e7dc407..866b33c03 100644 --- a/java/java.go +++ b/java/java.go @@ -1380,7 +1380,7 @@ func (j *Module) compileJavaHeader(ctx android.ModuleContext, srcFiles, srcJars // since we have to strip META-INF/TRANSITIVE dir from turbine.jar combinedJar := android.PathForModuleOut(ctx, "turbine-combined", jarName) TransformJarsToJar(ctx, combinedJar, "for turbine", jars, android.OptionalPath{}, - false, nil, []string{"META-INF"}) + false, nil, []string{"META-INF/TRANSITIVE"}) headerJar = combinedJar if j.expandJarjarRules != nil { |