From abbcb0a12cbab782c1d9879391efb65e9cd92acf Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 13 Jun 2015 14:38:04 -0700
Subject: Modified ant build script so that it can be integrated with Android
 Studio's build system

---
 java/build.xml | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

(limited to 'java/build.xml')

diff --git a/java/build.xml b/java/build.xml
index e24a0e13..93d754a6 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,4 +1,4 @@
-<project default="build" name="ZeroTierOneSDK" basedir=".">
+<project default="build_jar" name="ZeroTierOneSDK" basedir=".">
     <property environment="env"/>
 
     <condition property="isWindows">
@@ -9,7 +9,7 @@
       <os family="mac"/>
     </condition>
 
-    <target name="clean">
+    <target name="clean_ant">
         <delete dir="bin" failonerror="false"/>
         <delete dir="classes" failonerror="false"/>
         <delete dir="build_win32" failonerror="false"/>
@@ -24,6 +24,10 @@
         <echo message="os.arch          = ${os.arch}"/>
         <echo message="ant.java.version = ${ant.java.version}"/>
         <echo message="java.version     = ${java.version}"/>
+        <echo message="ndk.loc          = ${env.NDK_BUILD_LOC}"/>
+        <echo message="sdk.loc          = ${env.ANDROID_PLATFORM}"/>
+        <echo message="user.dir         = ${user.dir}"/>
+        <echo message="zt1.dir          = ${env.ZT}"/>
         <mkdir dir="bin"/>
         <mkdir dir="classes"/>
         <javac srcdir="src"
@@ -36,20 +40,20 @@
 
     <target name="build_android">
         <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
-            <arg value="ZT1=${user.dir}/../"/>
+            <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
         </exec>
         <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="${user.dir}/classes/lib/armeabi/libZeroTierOneJNI.so" 
+              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/arm64-v8a/libZeroTierOneJNI.so"
+              tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
+              tofile="classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/x86/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/x86/libZeroTierOneJNI.so"
+              tofile="classes/lib/x86/libZeroTierOneJNI.so"
               overwrite="true"/>
     </target>
 
@@ -91,7 +95,7 @@
             overwrite="true"/>
     </target>
 
-    <target name="build" depends="build_java,build_android,windows,mac">    
+    <target name="build_jar" depends="build_java,build_android,windows,mac">
         <jar destfile="bin/ZeroTierOneSDK.jar" basedir="classes"/>
     </target>
 
@@ -101,23 +105,4 @@
       <javadoc sourcepath="src/"
                destdir="doc/"/>
     </target>
-
-<!--    <target name="android" depends="build">
-        <echo message="OS is Android, installing..."/>
-        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="${aproj_loc}/libs/armeabi/libZeroTierOneJNI.so" 
-              overwrite="true"/>
-        <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/arm64-v8a/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/armeabi-v7a/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy file="libs/x86/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/x86/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy   file="bin/ZeroTierOneSDK.jar" 
-                tofile="${aproj_loc}/libs/ZeroTierOneSDK.jar" 
-                overwrite="true"/>
-    </target> -->
 </project>
\ No newline at end of file
-- 
cgit v1.2.3


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: 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(-)

(limited to 'java/build.xml')

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
-- 
cgit v1.2.3


From f803dd5ff46cc03e07364961eb23feb64b7697bd Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 1 Jul 2015 18:13:39 -0700
Subject: ...

---
 java/build.xml                        | 1 +
 java/jni/Android.mk                   | 1 +
 java/jni/com_zerotierone_sdk_Node.cpp | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'java/build.xml')

diff --git a/java/build.xml b/java/build.xml
index 4bc1cdc0..4604ad66 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -42,6 +42,7 @@
         <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
             <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
+            <!-- <arg value="NDK_DEBUG=1"/> -->
         </exec>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
               tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index 9986c2c3..15ba3875 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ZeroTierOneJNI
 LOCAL_C_INCLUDES := $(ZT1)/include
 LOCAL_LDLIBS := -llog
+# LOCAL_CFLAGS := -g
 
 # ZeroTierOne SDK source files
 LOCAL_SRC_FILES := \
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index ca4c4838..e8f7272b 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -192,7 +192,11 @@ namespace {
     {
         LOGV("EventCallback");
         JniRef *ref = (JniRef*)userData;
-        assert(ref->node == node);
+        if(ref->node != node)
+        {
+            LOGE("Nodes not equal. ref->node %p, node %p", ref->node, node);
+            return;
+        }
         JNIEnv *env = NULL;
         ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
@@ -613,6 +617,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         &VirtualNetworkConfigFunctionCallback,
         &EventCallback);
 
+    LOGI("Node Created.");
+    
     if(rc != ZT1_RESULT_OK)
     {
         LOGE("Error creating Node: %d", rc);
-- 
cgit v1.2.3