diff options
| author | 2019-10-31 15:22:57 -0700 | |
|---|---|---|
| committer | 2019-11-07 02:05:06 +0000 | |
| commit | c2557d1d566c9b0775a35c7a6d19e5513bf666b5 (patch) | |
| tree | 4eb28e8162f23113d7040d6e566d2032ed1748ea /java/dex.go | |
| parent | c48ea97c9c8b7395c645f83b8b825012657c0c0a (diff) | |
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
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 4 |
1 files changed, 2 insertions, 2 deletions
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...) |