summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-05-29 14:40:35 -0700
committer Colin Cross <ccross@android.com> 2019-06-04 10:22:51 -0700
commit41955e8895fe33022a6759b9739a2368b206c392 (patch)
treef1a20db995473d7475a502113eb583b317c39a0a /java/app_test.go
parent4c2c46f0a72e21ffe6be407028b857ba461144d7 (diff)
Support tagged module references
There are cases where a module needs to refer to an intermediate output of another module instead of its final output. For example, a module may want to use the .jar containing .class files from another module whose final output is a .jar containing classes.dex files. Support a new ":module{.tag}" format in any property that is annotated with `android:"path"`, which will query the target module for its ".tag" output(s). Test: path_properties_test.go, paths_test.go Test: no unexpected changes in build.ninja Change-Id: Icd3c9b0d83ff125771767c04046fcffb9fc3f65a
Diffstat (limited to 'java/app_test.go')
-rw-r--r--java/app_test.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/java/app_test.go b/java/app_test.go
index 559afcc7d..9aedebd76 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -130,8 +130,12 @@ func TestAppSplits(t *testing.T) {
foo.Output(expectedOutput)
}
- if g, w := foo.Module().(*AndroidApp).Srcs().Strings(), expectedOutputs; !reflect.DeepEqual(g, w) {
- t.Errorf("want Srcs() = %q, got %q", w, g)
+ outputFiles, err := foo.Module().(*AndroidApp).OutputFiles("")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if g, w := outputFiles.Strings(), expectedOutputs; !reflect.DeepEqual(g, w) {
+ t.Errorf(`want OutputFiles("") = %q, got %q`, w, g)
}
}