diff options
| author | Colin Cross <ccross@android.com> | 2017-10-25 20:32:18 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-26 14:47:40 +0000 |
| commit | 715d7110f7740c706f67d07263be14e88e2e5ee7 (patch) | |
| tree | f23a1adb4474c0ba5c439b1bc119862db2e872cd /java/java_test.go | |
| parent | b563989f97c2579061ccb12152efecebdf762a33 (diff) | |
| download | android_build_soong-715d7110f7740c706f67d07263be14e88e2e5ee7.tar.gz android_build_soong-715d7110f7740c706f67d07263be14e88e2e5ee7.tar.bz2 android_build_soong-715d7110f7740c706f67d07263be14e88e2e5ee7.zip | |
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 8ac4b3b2..b819447c 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -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) { |