diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-23 21:12:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-23 21:12:13 +0000 |
| commit | 254aaec32870c16d97a7c8b1320c250f71c5d3f7 (patch) | |
| tree | 7f476455c123397170caa96b8f215cafda7c8a07 /java/java_test.go | |
| parent | d8cc795f86a2a69b73fa3abad9688158b6dcc351 (diff) | |
| parent | e243c231da6fca6c40f8075bf014094f4ec0fce0 (diff) | |
Merge changes from topic "soong_prebuilts_misc_common"
* changes:
Fix finding src directory for aidl
Support multiple outputs in genrules with depfile: true
Support installable prebuilt jars
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index 451f58e9b..8ac4b3b2f 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -613,13 +613,13 @@ func TestGeneratedSources(t *testing.T) { javac := ctx.ModuleForTests("foo", "android_common").Rule("javac") genrule := ctx.ModuleForTests("gen", "").Rule("generator") - if len(genrule.Outputs) != 1 || filepath.Base(genrule.Outputs[0].String()) != "gen.java" { - t.Fatalf(`gen output file %v is not [".../gen.java"]`, genrule.Outputs.Strings()) + if filepath.Base(genrule.Output.String()) != "gen.java" { + t.Fatalf(`gen output file %v is not ".../gen.java"`, genrule.Output.String()) } if len(javac.Inputs) != 3 || javac.Inputs[0].String() != "a.java" || - javac.Inputs[1].String() != genrule.Outputs[0].String() || + javac.Inputs[1].String() != genrule.Output.String() || javac.Inputs[2].String() != "b.java" { t.Errorf(`foo inputs %v != ["a.java", ".../gen.java", "b.java"]`, javac.Inputs) } |