Permalink
Browse files

Merge branch 'master' of https://github.com/jreyes/maven-android-plugin

… into pull132
  • Loading branch information...
2 parents 52531f3 + ab5b97d commit 79c35b08639e8468a871b3a82153e93d7293e147 @mosabua mosabua committed Sep 19, 2012
Showing with 13 additions and 5 deletions.
  1. +13 −5 src/main/java/com/jayway/maven/plugins/android/phase05compile/NdkBuildMojo.java
@@ -288,9 +288,9 @@
private Boolean skipStripping;
/**
- * @parameter expression="${android.ndk.build.ndk-toolchain}" default-value="arm-linux-androideabi-4.4.3"
+ * @parameter expression="${android.ndk.build.ndk-toolchain}"
*/
- @PullParameter( defaultValue = "arm-linux-androideabi-4.4.3" )
+ @PullParameter
private String ndkToolchain;
@@ -431,10 +431,8 @@ public void execute() throws MojoExecutionException, MojoFailureException
configureApplicationMakefile( commands );
configureMaxJobs( commands );
+ configureNdkToolchain( commands );
- // Setup the correct toolchain to use
- // FIXME: perform a validation that this toolchain exists in the NDK
- commands.add( "NDK_TOOLCHAIN=" + ndkToolchain );
// Anything else on the command line the user wants to add - simply splice it up and
// add it one by one to the command line
if ( ndkBuildAdditionalCommandline != null )
@@ -502,6 +500,16 @@ private void configureMaxJobs( List<String> commands )
}
}
+ private void configureNdkToolchain( List<String> commands )
+ {
+ if ( ndkToolchain != null )
+ {
+ // Setup the correct toolchain to use
+ // FIXME: perform a validation that this toolchain exists in the NDK
+ commands.add( "NDK_TOOLCHAIN=" + ndkToolchain );
+ }
+ }
+
private void cleanUp( File nativeLibDirectory, boolean libsDirectoryExists, File directoryToRemove,
MakefileHelper.MakefileHolder makefileHolder, File makefileCaptureFile )
throws IOException, MojoExecutionException

0 comments on commit 79c35b0

Please sign in to comment.