Merge pull request #26 from jreyes/maven_fix

Fixed maven ndk build
lukeweber · Oct 3, 2012 · 3a5e7ed · 3a5e7ed
2 parents 74e4ca3 + 988369b
commit 3a5e7ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
         <android.api.version>14</android.api.version>
         <android.version>4.0.1.2</android.version>
 
-        <android-maven-plugin.version>3.3.2</android-maven-plugin.version>
+        <android-maven-plugin.version>3.3.3-SNAPSHOT</android-maven-plugin.version>
         <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
         <maven-jarsigner-plugin.version>1.2</maven-jarsigner-plugin.version>
         <native-maven-plugin.version>1.0-alpha-7</native-maven-plugin.version>
@@ -83,7 +83,6 @@
                             <platform>${android.api.version}</platform>
                             <path>${env.ANDROID_HOME}</path>
                         </sdk>
-                        <ndkBuildAdditionalCommandline>-j2 NDK_APPLICATION_MK=${android.ndkappfile}</ndkBuildAdditionalCommandline>
                         <undeployBeforeDeploy>true</undeployBeforeDeploy>
                         <nativeLibrariesDependenciesHardwareArchitectureOverrides>
                             <nativeLibrariesDependenciesHardwareArchitectureOverride>
@@ -102,6 +101,20 @@
         </pluginManagement>
     </build>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>oss.sonatype.org-jayway-snapshots</id>
+            <name>Jayway OpenSource SNAPSHOTs on Sonatype.org</name>
+            <url>http://oss.sonatype.org/content/repositories/jayway-snapshots/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
     <profiles>
         <profile>
             <id>standard-debug</id>

diff --git a/voice-client-core/pom.xml b/voice-client-core/pom.xml
@@ -49,10 +49,11 @@
                 <extensions>true</extensions>
                 <configuration>
                     <apkDebug>false</apkDebug>
-                    <makefile>jni/Android.mk</makefile>
                     <target>all</target>
+                    <maxJobs>true</maxJobs>
+                    <applicationMakefile>${android.ndkappfile}</applicationMakefile>
                 </configuration>
-                <!--<executions>
+                <executions>
                     <execution>
                         <id>executeNdk</id>
                         <phase>prepare-package</phase>
@@ -61,7 +62,6 @@
                         </goals>
                     </execution>
                 </executions>
-                -->
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>