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
This commit is contained in:
@@ -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()) {
|
||||
|
Reference in New Issue
Block a user