diff options
| author | Colin Cross <ccross@android.com> | 2015-04-10 17:44:24 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-13 12:25:40 -0700 |
| commit | 6d1e72d7c69d1787b6d7edf990925a65f43b48ea (patch) | |
| tree | cef145ab5b2bf3a4f528845ca70c26bffab42e17 /java/java.go | |
| parent | 2097830df79aa14ebe581f477406a34e6f5cb7e9 (diff) | |
Fix multi-dex builds
Building with --multi-dex requires passing an output directory
instead of an output file to dx.
Change-Id: I9ffcfe8ff6b96dbdda3eec1076124cd38ae5077f
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 2d1aaa53b..7f6b13463 100644 --- a/java/java.go +++ b/java/java.go @@ -326,13 +326,13 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { 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) |