From c2557d1d566c9b0775a35c7a6d19e5513bf666b5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 31 Oct 2019 15:22:57 -0700 Subject: Fix turbine classpath arguments We were passing "--classpath foo.jar --classpath bar.jar" to turbine, it now wants (and may always have expected?) "--classpath foo.jar bar.jar". Test: m checkbuild Change-Id: Ib7e0ca64a34e236110f7b785d6a0fb51ed75567e --- java/dex.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/dex.go') diff --git a/java/dex.go b/java/dex.go index c8a4fa8ed..5b25b2175 100644 --- a/java/dex.go +++ b/java/dex.go @@ -85,8 +85,8 @@ func (j *Module) dexCommonFlags(ctx android.ModuleContext) []string { func (j *Module) d8Flags(ctx android.ModuleContext, flags javaBuilderFlags) ([]string, android.Paths) { d8Flags := j.dexCommonFlags(ctx) - d8Flags = append(d8Flags, flags.bootClasspath.FormTurbineClasspath("--lib ")...) - d8Flags = append(d8Flags, flags.classpath.FormTurbineClasspath("--lib ")...) + d8Flags = append(d8Flags, flags.bootClasspath.FormRepeatedClassPath("--lib ")...) + d8Flags = append(d8Flags, flags.classpath.FormRepeatedClassPath("--lib ")...) var d8Deps android.Paths d8Deps = append(d8Deps, flags.bootClasspath...) -- cgit v1.2.3-59-g8ed1b