gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

documentation/API update

Browse Source
This commit is contained in:
Joseph Henry
2016-07-14 08:40:40 -07:00
parent 1487ac304c
commit f805b0d285
25 changed files with 375 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integrations/android/android_jni_lib/java/jni/Application.mk
View File

@@ -1,13 +1,13 @@
NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static
APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DSDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_CPPFLAGS := -O3 -DZT_DEBUG -DSDK_DEBUG -DLWIP_DEBUG -DUSE_SOCKS_PROXY -DSDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_PLATFORM := android-14
# Architectures
# APP_ABI := all
#APP_ABI += arm64-v8a
#APP_ABI += armeabi
APP_ABI += armeabi-v7a
APP_ABI += armeabi
#APP_ABI += armeabi-v7a
#APP_ABI += mips
#APP_ABI += mips64
#APP_ABI += x86

1
integrations/android/example_app/app/src/main/java/ZeroTier/SDK.java
View File

@@ -4,6 +4,5 @@ public class SDK {
public native void joinNetwork(String nwid);
public native void leaveNetwork(String nwid);
public native boolean isRunning();
static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code
}

2
integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
View File

@@ -32,7 +32,7 @@ public class MainActivity extends AppCompatActivity {
Log.d("SDK-Javaland", "Waiting...\n");
}
Log.d("SDK-Javaland","Joining network...\n");
wrapper.joinNetwork("e5cd7a9e1c3511dd");
wrapper.joinNetwork("565799d8f65063e5");
// Set up example proxy connection to SDK proxy server
Log.d("ZTSDK-InJavaland", "Setting up connection to SDK proxy server");