From 331a1213b0ece32fa2af20cbe00448bddd7d242b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Aug 2018 20:40:52 -0700 Subject: Don't pass resources to r8 R8 complains when it gets dex files in the input jar, but some tests use dex files or dex jars as resources. Keep resources separate from classes until after r8 has been run. Test: java_test.go Test: m checkbuild Change-Id: I1d9164d60d6b054ebb138648da07d80ee769177f --- java/java_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java_test.go') 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()) { -- cgit v1.2.3-59-g8ed1b