Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Moved the "--core-library" to before the "--output" option to enable the #34

Merged
merged 1 commit into from

2 participants

@kevinpotgieter

Moved the "--core-library" to before the "--output" option to enable the builds to succeed where the coreLibrary config option is used in the plugin

See issue No. 157

unknown Moved the --"core-library" to before the "--output" option to enable …
…the builds to succedd where the coreLibrary config option is used in the plugin

See issue No. 157
c5a3031
@mosabua mosabua merged commit 37c1f68 into simpligility:maven-android-plugin-2.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 20, 2011
  1. Moved the --"core-library" to before the "--output" option to enable …

    unknown authored
    …the builds to succedd where the coreLibrary config option is used in the plugin
    
    See issue No. 157
This page is out of date. Refresh to see the latest.
View
7 src/main/java/com/jayway/maven/plugins/android/phase08preparepackage/DexMojo.java
@@ -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 {
Something went wrong with that request. Please try again.