diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index e764ec303..866b33c03 100644 --- a/java/java.go +++ b/java/java.go @@ -639,7 +639,7 @@ func getLinkType(m *Module, name string) (ret linkType, stubs bool) { switch { case name == "core.current.stubs" || name == "core.platform.api.stubs" || name == "stub-annotations" || name == "private-stub-annotations-jar" || - name == "core-lambda-stubs": + name == "core-lambda-stubs" || name == "core-generated-annotation-stubs": return javaCore, true case ver == "core_current": return javaCore, false @@ -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 { |