summaryrefslogtreecommitdiff
path: root/java/builder.go
diff options
context:
space:
mode:
Diffstat (limited to 'java/builder.go')
-rw-r--r--java/builder.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/builder.go b/java/builder.go
index 4bdea2833..ff5de09bb 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -375,8 +375,11 @@ func TransformJarJar(ctx android.ModuleContext, outputFile android.WritablePath,
type classpath []android.Path
func (x *classpath) FormJavaClassPath(optName string) string {
+ if optName != "" && !strings.HasSuffix(optName, "=") && !strings.HasSuffix(optName, " ") {
+ optName += " "
+ }
if len(*x) > 0 {
- return optName + " " + strings.Join(x.Strings(), ":")
+ return optName + strings.Join(x.Strings(), ":")
} else {
return ""
}