diff options
| author | Colin Cross <ccross@android.com> | 2017-10-20 15:07:08 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-20 20:44:50 -0700 |
| commit | 15e86d938bea0cf95f2694714fbc4dc35ee2a30e (patch) | |
| tree | 9153d78f2efa6838bcc2f895f12b8d37f8eaa5a9 /java/java_test.go | |
| parent | 535e2cf4e1aa7b942e4662f6073517df0c00d09e (diff) | |
| download | android_build_soong-15e86d938bea0cf95f2694714fbc4dc35ee2a30e.tar.gz android_build_soong-15e86d938bea0cf95f2694714fbc4dc35ee2a30e.tar.bz2 android_build_soong-15e86d938bea0cf95f2694714fbc4dc35ee2a30e.zip | |
Support multiple outputs in genrules with depfile: true
Ninja doesn't support depfiles on a rule with multiple outputs.
Use a single output and put all the rest as implicit outputs.
Bug: 68057449
Test: java_test.go
Change-Id: Ia544493b1b3b51b185c865149d8f3e0eb3c57ee2
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 451f58e9..8ac4b3b2 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) } |