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

Fix kotlin -classpath argument am: 715d7110f7 

am: 6255422ccf

Change-Id: I8f816b635cee437f2ac9964bd7ddc74643cb1354
This commit is contained in:
Colin Cross 2017-10-26 14:56:11 +00:00 committed by android-build-merger
parent 9d2cb72bb8 6255422ccf
commit b9885293bd
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/builder.go
View File

@ -203,7 +203,7 @@ func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.Writ
Output: outputFile,
Inputs: inputs,
Args: map[string]string{
"classpath": flags.kotlincClasspath.FormJavaClassPath("--classpath"),
"classpath": flags.kotlincClasspath.FormJavaClassPath("-classpath"),
"kotlincFlags": flags.kotlincFlags,
"outDir": classDir.String(),
"javaVersion": flags.javaVersion,

12
java/java_test.go
View File

@ -631,6 +631,11 @@ func TestKotlin(t *testing.T) {
name: "foo",
srcs: ["a.java", "b.kt"],
}
java_library {
name: "bar",
srcs: ["b.kt"],
}
`)
kotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc")
@ -655,6 +660,13 @@ func TestKotlin(t *testing.T) {
t.Errorf("foo jar inputs %v does not contain %q",
jar.Inputs.Strings(), kotlinc.Output.String())
}
kotlinc = ctx.ModuleForTests("bar", "android_common").Rule("kotlinc")
jar = ctx.ModuleForTests("bar", "android_common").Output("combined/bar.jar")
if len(kotlinc.Inputs) != 1 || kotlinc.Inputs[0].String() != "b.kt" {
t.Errorf(`bar kotlinc inputs %v != ["b.kt"]`, kotlinc.Inputs)
}
}
func fail(t *testing.T, errs []error) {