Fix kotlin -classpath argument

kotlinc expects -classpath, not --classpath.

Also add a test that uses only .kt files to exercise the code when
there are no java sources.

Test: java_test.go
Change-Id: Ifa5a007b460b40ea2188d0907570fbdca6c48da7
This commit is contained in:
Colin Cross
2017-10-25 20:32:18 -07:00
parent b563989f97
commit 715d7110f7
2 changed files with 13 additions and 1 deletions

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,