Merge "Don't hide *.kotlin_module in turbine dependencies"

2019-05-13 20:21:47 +00:00
parent 95aabdad9c 6c6e6cd64d
commit f3e802bf0d
4 changed files with 21 additions and 10 deletions
--- 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 {