diff options
| author | Colin Cross <ccross@android.com> | 2020-11-13 16:23:53 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-11-17 11:23:45 -0800 |
| commit | 3d680512183432ba7234f3cce03be6185e439e08 (patch) | |
| tree | eab78862db2501cfd32e6c5ca6935ce9328a417d /java/java_test.go | |
| parent | beab64ea815d34a110d3dc50f10da760ac67e1de (diff) | |
Move genrule on top of RuleBuilder
In preparation for more complicated sandboxing support in sbox, use
a single implementation of the sbox sandboxing by moving genrule to
use RuleBuilder's sbox support instead of creating an sbox rule
directly.
Also move genrule's input list hash support into RuleBuilder.
Test: genrule_test.go
Test: rule_builder_test.go
Change-Id: I292184d02743c7e6887ebbcd232ba565db2ab0cc
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index 87d6ebbd4..efca03952 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1379,8 +1379,8 @@ func TestJarGenrules(t *testing.T) { baz := ctx.ModuleForTests("baz", "android_common").Output("javac/baz.jar") barCombined := ctx.ModuleForTests("bar", "android_common").Output("combined/bar.jar") - if len(jargen.Inputs) != 1 || jargen.Inputs[0].String() != foo.Output.String() { - t.Errorf("expected jargen inputs [%q], got %q", foo.Output.String(), jargen.Inputs.Strings()) + if g, w := jargen.Implicits.Strings(), foo.Output.String(); !android.InList(w, g) { + t.Errorf("expected jargen inputs [%q], got %q", w, g) } if !strings.Contains(bar.Args["classpath"], jargen.Output.String()) { |