diff options
| author | Colin Cross <ccross@android.com> | 2018-08-27 15:42:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-29 05:41:25 +0000 |
| commit | 9b38aef1820906223ca0da716bd90c2924147a39 (patch) | |
| tree | b63f13a1caa3b4a93a385edc9f9c5679f9a06ad0 /java/java_test.go | |
| parent | e97e68a05ace114b7eb44f271ea0411d41d5a4db (diff) | |
| download | build_soong-9b38aef1820906223ca0da716bd90c2924147a39.tar.gz build_soong-9b38aef1820906223ca0da716bd90c2924147a39.tar.bz2 build_soong-9b38aef1820906223ca0da716bd90c2924147a39.zip | |
Revert "Add support for renamed kotlin stdlib."
This reverts commit 66c0c4067f8a70847eaa37273671aa8fe4203f1d.
Bug: 112674805
Test: m checkbuild
Change-Id: I687888136b570f080b57af352af0130355acd216
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/java/java_test.go b/java/java_test.go index c9f3dbf1..3ace528d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -209,8 +209,6 @@ func testContext(config android.Config, bp string, "bar-doc/IFoo.aidl": nil, "bar-doc/known_oj_tags.txt": nil, "external/doclava/templates-sdk": nil, - - "external/kotlinc/jarjar-rules.txt": nil, } for k, v := range fs { @@ -823,12 +821,6 @@ func TestKotlin(t *testing.T) { name: "baz", srcs: ["c.java"], } - - java_library { - name: "blorg", - renamed_kotlin_stdlib: true, - srcs: ["b.kt"], - } `) fooKotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc") @@ -871,12 +863,6 @@ func TestKotlin(t *testing.T) { t.Errorf(`expected %q in bar implicits %v`, bazHeaderJar.Output.String(), barKotlinc.Implicits.Strings()) } - - blorgRenamedJar := ctx.ModuleForTests("blorg", "android_common").Output("kotlin-renamed/blorg.jar") - if blorgRenamedJar.Implicit.String() != "external/kotlinc/jarjar-rules.txt" { - t.Errorf(`expected external/kotlinc/jarjar-rules.txt in blorg implicit %q`, - blorgRenamedJar.Implicit.String()) - } } func TestTurbine(t *testing.T) { |