Fix multi-dex builds
Building with --multi-dex requires passing an output directory
instead of an output file to dx.
Change-Id: I9ffcfe8ff6b96dbdda3eec1076124cd38ae5077f
diff --git a/java/java.go b/java/java.go
index 2d1aaa5..7f6b134 100644
--- a/java/java.go
+++ b/java/java.go
@@ -326,13 +326,13 @@
flags.dxFlags = strings.Join(dxFlags, " ")
// Compile classes.jar into classes.dex
- dexFile := TransformClassesJarToDex(ctx, outputFile, flags)
+ dexJarSpec := TransformClassesJarToDex(ctx, outputFile, flags)
if ctx.Failed() {
return
}
// Combine classes.dex + resources into javalib.jar
- outputFile = TransformDexToJavaLib(ctx, resourceJarSpecs, dexFile)
+ outputFile = TransformDexToJavaLib(ctx, resourceJarSpecs, dexJarSpec)
}
j.installFile = ctx.InstallFileName("framework", ctx.ModuleName()+".jar", outputFile)