Browse Source

configure the NDK to build all supported ABIs and package them up in the jar

Grant Limberg 10 years ago
parent
commit
bfb152f53f
2 changed files with 15 additions and 5 deletions
  1. 12 3
      java/build.xml
  2. 3 2
      java/jni/Application.mk

+ 12 - 3
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>
 
 

+ 3 - 2
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