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

Paritally updated Android Studio project

Browse Source
This commit is contained in:
Joseph Henry
2016-06-15 14:19:56 -07:00
parent ac0699c362
commit c46bc402e0
9 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integrations/Android/java/jni/Android.mk
View File

@@ -16,10 +16,10 @@ LOCAL_LDLIBS := -llog
# Netcon files
LOCAL_SRC_FILES := \
$(ZT1)/netcon/NetconRPC.c \
$(ZT1)/netcon/NetconProxy.cpp \
$(ZT1)/netcon/NetconServiceSetup.cpp \
$(ZT1)/netcon/NetconEthernetTap.cpp
$(ZT1)/src/SDK_RPC.c \
$(ZT1)/src/SDK_Proxy.cpp \
$(ZT1)/src/SDK_ServiceSetup.cpp \
$(ZT1)/src/SDK_EthernetTap.cpp
# ZeroTierOne ext files
LOCAL_SRC_FILES += \

2
integrations/Android/java/jni/Application.mk
View File

@@ -1,6 +1,6 @@
NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static
APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SERVICE_NETCON -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_PLATFORM := android-14
# Architectures

6
integrations/Android/proj/app/src/main/java/Netcon/NetconWrapper.java → integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java
View File

@@ -1,12 +1,12 @@
package Netcon;
/**
* Created by Joseph on 3/14/16.
* Created by Joseph Henry on 3/14/16.
*/
public class NetconWrapper {
public class ZT_SDK_Wrapper {
public native int loadsymbols();
// From OneServiceSetup.cpp
// From SDK_ServiceSetup.cpp
public native void startOneService();
static {