From bfb152f53f528934583ee76437453a005610a7ea Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 24 Jun 2015 20:31:22 -0700
Subject: [PATCH] configure the NDK to build all supported ABIs and package
 them up in the jar

---
 java/build.xml          | 15 ++++++++++++---
 java/jni/Application.mk |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/java/build.xml b/java/build.xml
index 93d754a64..4bc1cdc08 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -43,18 +43,27 @@
             <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
         </exec>
-        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
-              overwrite="true"/>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
               tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
+              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
+              overwrite="true"/>
         <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
               tofile="classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/mips/libZeroTierOneJNI.so"
+              tofile="classes/lib/mips/libZeroTierOneJNI.so"
+              overwrite="true"/>
+        <copy file="libs/mips64/libZeroTierOneJNI.so"
+              tofile="classes/lib/mips64/libZeroTierOne.so"
+              overwrite="true"/>
         <copy file="libs/x86/libZeroTierOneJNI.so"
               tofile="classes/lib/x86/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/x86_64/libZeroTierOneJNI.so"
+              tofile="classes/lib/x86_64/libZeroTierOneJNI.so"
+              overwrite="true"/>
     </target>
 
 
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 3118ec2e4..8b6c80208 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,4 +1,5 @@
 APP_ABI := armeabi armeabi-v7a arm64-v8a x86
 APP_STL := gnustl_static
-APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions -DZT_TRACE
-
+APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions
+APP_PLATFORM := android-14
+APP_ABI := all