Permalink
Browse files

Merge pull request #34 from kevinpotgieter/maven-android-plugin-2.x

Moved the "--core-library" to before the "--output" option to enable the
  • Loading branch information...
2 parents d5780bc + c5a3031 commit 37c1f681634b08295be29f691d8d46121eeb3738 @mosabua mosabua committed May 20, 2011
@@ -105,14 +105,15 @@ private void runDex(CommandExecutor executor, File outputFile,
commands.add("-jar");
commands.add(getAndroidSdk().getPathForTool("dx.jar"));
commands.add("--dex");
+ if (coreLibrary) {
+ commands.add("--core-library");
+ }
commands.add("--output=" + outputFile.getAbsolutePath());
if (noLocals) {
commands.add("--no-locals");
}
commands.add(classesOutputDirectory.getAbsolutePath());
- if (coreLibrary) {
- commands.add("--core-library");
- }
+
final String javaExecutable = getJavaExecutable().getAbsolutePath();
getLog().info(javaExecutable + " " + commands.toString());
try {

0 comments on commit 37c1f68

Please sign in to comment.