diff options
| author | 2018-08-17 02:35:40 +0000 | |
|---|---|---|
| committer | 2018-08-17 02:35:40 +0000 | |
| commit | a192c7370ceda0de72bad1ed96e515d9c46636e0 (patch) | |
| tree | 032097b19c10faa258092fc851f0d398b02e4439 /java/java_test.go | |
| parent | 00fcb26f2f972e5f3d31812d9cdf49d62e754240 (diff) | |
| parent | 331a1213b0ece32fa2af20cbe00448bddd7d242b (diff) | |
Merge changes from topic "java_test_junit"
* changes:
Don't pass resources to r8
Support patch_module in java modules
Make :module provide the output file for java modules
Don't link java tests against junit by default
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 434bcc7f3..72341ee26 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -719,7 +719,7 @@ func TestResources(t *testing.T) { } `+test.extra) - foo := ctx.ModuleForTests("foo", "android_common").Output("combined/foo.jar") + foo := ctx.ModuleForTests("foo", "android_common").Output("withres/foo.jar") fooRes := ctx.ModuleForTests("foo", "android_common").Output("res/foo.jar") if !inList(fooRes.Output.String(), foo.Inputs.Strings()) { |