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

updated JNI build, added unit test targets to Jenkinsfile

Browse Source
This commit is contained in:
Joseph Henry
2016-11-04 14:23:57 -07:00
parent e864c333fc
commit 47ca4b7f67
5 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
integrations/android/android_jni_lib/java/jni/Android.mk
View File

@@ -8,23 +8,26 @@ ZT := ../../../../../zerotierone
LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(ZT1)/include
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/ipv4
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/lwip
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/lwip/priv
LOCAL_C_INCLUDES += $(ZT1)/node
LOCAL_C_INCLUDES += $(ZT1)/
LOCAL_C_INCLUDES += $(ZT1)/service
LOCAL_C_INCLUDES += $(ZT1)/osdep
LOCAL_C_INCLUDES += $(ZTSDK)/src
LOCAL_C_INCLUDES += $(ZTSDK)/stack_drivers/lwip
LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g
# Netcon files
LOCAL_SRC_FILES := \
$(ZTSDK)/SDK_RPC.c \
$(ZTSDK)/SDK_Proxy.cpp \
$(ZTSDK)/SDK_Sockets.c \
$(ZTSDK)/SDK_Service.cpp \
$(ZTSDK)/SDK_EthernetTap.cpp
$(ZTSDK)/rpc.c \
$(ZTSDK)/proxy.cpp \
$(ZTSDK)/sockets.c \
$(ZTSDK)/service.cpp \
$(ZTSDK)/tap.cpp
# ZeroTierOne ext files
LOCAL_SRC_FILES += \

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

@@ -1,6 +1,6 @@
NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static
APP_CPPFLAGS := -g -O3 -DSDK_BUNDLED -DZT_DEBUG -DSDK_DEBUG -DLWIP_DEBUG -DSDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_CPPFLAGS := -g -O3 -DSDK_BUNDLED -DZT_DEBUG -DSDK_DEBUG -DLWIP_DEBUG -DSDK_LWIP=1 -DSDK_IPV4=1 -DSDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_CFLAGS := -g -DSDK_BUNDLED
APP_PLATFORM := android-14