openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing dependencies on classpath jars for kotlinc 

The kotlinc build rules were missing dependencies on the jars in
the classpath.

Test: TestKotlin in java_test.go
Change-Id: I56681785289f942b1070751b7dc5944e7a995b7f
This commit is contained in:
Colin Cross 2017-12-15 20:20:39 -08:00
parent 2555b259ad
commit 9bc4343bea
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/builder.go
View File

@ -214,11 +214,15 @@ func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.Writ
inputs := append(android.Paths(nil), srcFiles...) inputs := append(android.Paths(nil), srcFiles...)
inputs = append(inputs, srcJars...) inputs = append(inputs, srcJars...)
var deps android.Paths
deps = append(deps, flags.kotlincClasspath...)
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: kotlinc, Rule: kotlinc,
Description: "kotlinc", Description: "kotlinc",
Output: outputFile, Output: outputFile,
Inputs: inputs, Inputs: inputs,
Implicits: deps,
Args: map[string]string{ Args: map[string]string{
"classpath": flags.kotlincClasspath.FormJavaClassPath("-classpath"), "classpath": flags.kotlincClasspath.FormJavaClassPath("-classpath"),
"kotlincFlags": flags.kotlincFlags, "kotlincFlags": flags.kotlincFlags,

50
java/java_test.go
View File

@ -711,37 +711,55 @@ func TestKotlin(t *testing.T) {
java_library { java_library {
name: "bar", name: "bar",
srcs: ["b.kt"], srcs: ["b.kt"],
libs: ["foo"],
static_libs: ["baz"],
}
java_library {
name: "baz",
srcs: ["c.java"],
} }
`) `)
kotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc") fooKotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc")
javac := ctx.ModuleForTests("foo", "android_common").Rule("javac") fooJavac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
jar := ctx.ModuleForTests("foo", "android_common").Output("combined/foo.jar") fooJar := ctx.ModuleForTests("foo", "android_common").Output("combined/foo.jar")
if len(kotlinc.Inputs) != 2 || kotlinc.Inputs[0].String() != "a.java" || if len(fooKotlinc.Inputs) != 2 || fooKotlinc.Inputs[0].String() != "a.java" ||
kotlinc.Inputs[1].String() != "b.kt" { fooKotlinc.Inputs[1].String() != "b.kt" {
t.Errorf(`foo kotlinc inputs %v != ["a.java", "b.kt"]`, kotlinc.Inputs) t.Errorf(`foo kotlinc inputs %v != ["a.java", "b.kt"]`, fooKotlinc.Inputs)
} }
if len(javac.Inputs) != 1 || javac.Inputs[0].String() != "a.java" { if len(fooJavac.Inputs) != 1 || fooJavac.Inputs[0].String() != "a.java" {
t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs) t.Errorf(`foo inputs %v != ["a.java"]`, fooJavac.Inputs)
} }
if !strings.Contains(javac.Args["classpath"], kotlinc.Output.String()) { if !strings.Contains(fooJavac.Args["classpath"], fooKotlinc.Output.String()) {
t.Errorf("foo classpath %v does not contain %q", t.Errorf("foo classpath %v does not contain %q",
javac.Args["classpath"], kotlinc.Output.String()) fooJavac.Args["classpath"], fooKotlinc.Output.String())
} }
if !inList(kotlinc.Output.String(), jar.Inputs.Strings()) { if !inList(fooKotlinc.Output.String(), fooJar.Inputs.Strings()) {
t.Errorf("foo jar inputs %v does not contain %q", t.Errorf("foo jar inputs %v does not contain %q",
jar.Inputs.Strings(), kotlinc.Output.String()) fooJar.Inputs.Strings(), fooKotlinc.Output.String())
} }
kotlinc = ctx.ModuleForTests("bar", "android_common").Rule("kotlinc") fooHeaderJar := ctx.ModuleForTests("foo", "android_common").Output("turbine-combined/foo.jar")
jar = ctx.ModuleForTests("bar", "android_common").Output("combined/bar.jar") bazHeaderJar := ctx.ModuleForTests("baz", "android_common").Output("turbine-combined/baz.jar")
barKotlinc := ctx.ModuleForTests("bar", "android_common").Rule("kotlinc")
if len(kotlinc.Inputs) != 1 || kotlinc.Inputs[0].String() != "b.kt" { if len(barKotlinc.Inputs) != 1 || barKotlinc.Inputs[0].String() != "b.kt" {
t.Errorf(`bar kotlinc inputs %v != ["b.kt"]`, kotlinc.Inputs) t.Errorf(`bar kotlinc inputs %v != ["b.kt"]`, barKotlinc.Inputs)
}
if !inList(fooHeaderJar.Output.String(), barKotlinc.Implicits.Strings()) {
t.Errorf(`expected %q in bar implicits %v`,
fooHeaderJar.Output.String(), barKotlinc.Implicits.Strings())
}
if !inList(bazHeaderJar.Output.String(), barKotlinc.Implicits.Strings()) {
t.Errorf(`expected %q in bar implicits %v`,
bazHeaderJar.Output.String(), barKotlinc.Implicits.Strings())
} }
} }