summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-06-24 20:31:22 -0700
committerGrant Limberg <glimberg@gmail.com>2015-06-24 20:31:22 -0700
commitbfb152f53f528934583ee76437453a005610a7ea (patch)
treede70d83a74c9aee770c60dfe639d2732ac49088b
parent759d71037ef429c0277d8bebe16cc4ac1f426c45 (diff)
downloadinfinitytier-bfb152f53f528934583ee76437453a005610a7ea.tar.gz
infinitytier-bfb152f53f528934583ee76437453a005610a7ea.zip
configure the NDK to build all supported ABIs and package them up in the jar
-rw-r--r--java/build.xml15
-rw-r--r--java/jni/Application.mk5
2 files changed, 15 insertions, 5 deletions
diff --git a/java/build.xml b/java/build.xml
index 93d754a6..4bc1cdc0 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 3118ec2e..8b6c8020 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