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

macOS static lib build target update, minor android/unity3d updates

Browse Source
This commit is contained in:
Joseph Henry
2016-12-20 12:57:59 -08:00
parent 7393c80ae6
commit 2741508520
27 changed files with 469 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,35 +2,31 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
ZTSDK := ../../../../../src
ZT := ../../../../../zerotierone
ZTSDK := $(ZT1)/..
ZT := $(ZTSDK)/zerotierone
LWIP := $(ZTSDK)/ext/lwip/src
LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(ZT1)/include
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/lwip
LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/lwip/priv
LOCAL_C_INCLUDES := $(LWIP)/include
LOCAL_C_INCLUDES += $(LWIP)/include/lwip
LOCAL_C_INCLUDES += $(LWIP)/include/lwip/priv
LOCAL_C_INCLUDES += $(ZTSDK)/src
LOCAL_C_INCLUDES += $(ZTSDK)/src/stack_drivers/lwip
LOCAL_C_INCLUDES += $(ZTSDK)/src/stack_drivers
LOCAL_C_INCLUDES += $(ZT1)/include
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)/rpc.c \
$(ZTSDK)/proxy.cpp \
$(ZTSDK)/sockets.c \
$(ZTSDK)/service.cpp \
$(ZTSDK)/tap.cpp
# ZeroTierOne ext files
LOCAL_SRC_FILES += \
LOCAL_SRC_FILES := \
$(ZT1)/ext/lz4/lz4.c \
$(ZT1)/ext/json-parser/json.c \
$(ZT1)/ext/http-parser/http_parser.c \
@@ -42,7 +38,6 @@ LOCAL_SRC_FILES += \
$(ZT1)/node/C25519.cpp \
$(ZT1)/node/CertificateOfMembership.cpp \
$(ZT1)/node/DeferredPackets.cpp \
$(ZT1)/node/Dictionary.cpp \
$(ZT1)/node/Identity.cpp \
$(ZT1)/node/IncomingPacket.cpp \
$(ZT1)/node/InetAddress.cpp \
@@ -63,59 +58,67 @@ LOCAL_SRC_FILES += \
$(ZT)/node/Utils.cpp \
$(ZT)/osdep/Http.cpp \
$(ZT)/osdep/OSUtils.cpp \
$(ZT)/osdep/ManagedRoute.cpp \
$(ZT)/osdep/BackgroundResolver.cpp
# lwIP api files
LOCAL_SRC_FILES += \
$(ZT)/ext/lwip/src/api/api_lib.c \
$(ZT)/ext/lwip/src/api/api_msg.c \
$(ZT)/ext/lwip/src/api/err.c \
$(ZT)/ext/lwip/src/api/netbuf.c \
$(ZT)/ext/lwip/src/api/netdb.c \
$(ZT)/ext/lwip/src/api/netifapi.c \
$(ZT)/ext/lwip/src/api/sockets.c \
$(ZT)/ext/lwip/src/api/tcpip.c
# lwIP core files
LOCAL_SRC_FILES += \
$(ZT)/ext/lwip/src/core/def.c \
$(ZT)/ext/lwip/src/core/dhcp.c \
$(ZT)/ext/lwip/src/core/dns.c \
$(ZT)/ext/lwip/src/core/init.c \
$(ZT)/ext/lwip/src/core/mem.c \
$(ZT)/ext/lwip/src/core/memp.c \
$(ZT)/ext/lwip/src/core/netif.c \
$(ZT)/ext/lwip/src/core/pbuf.c \
$(ZT)/ext/lwip/src/core/raw.c \
$(ZT)/ext/lwip/src/core/stats.c \
$(ZT)/ext/lwip/src/core/sys.c \
$(ZT)/ext/lwip/src/core/tcp_in.c \
$(ZT)/ext/lwip/src/core/tcp_out.c \
$(ZT)/ext/lwip/src/core/tcp.c \
$(ZT)/ext/lwip/src/core/timers.c \
$(ZT)/ext/lwip/src/core/udp.c
#lwip
LOCAL_SRC_FILES += $(LWIP)/core/init.c \
$(LWIP)/core/def.c \
$(LWIP)/core/dns.c \
$(LWIP)/core/inet_chksum.c \
$(LWIP)/core/ip.c \
$(LWIP)/core/mem.c \
$(LWIP)/core/memp.c \
$(LWIP)/core/netif.c \
$(LWIP)/core/pbuf.c \
$(LWIP)/core/raw.c \
$(LWIP)/core/stats.c \
$(LWIP)/core/sys.c \
$(LWIP)/core/tcp.c \
$(LWIP)/core/tcp_in.c \
$(LWIP)/core/tcp_out.c \
$(LWIP)/core/timeouts.c \
$(LWIP)/core/udp.c
LOCAL_SRC_FILES += $(LWIP)/core/ipv4/autoip.c \
$(LWIP)/core/ipv4/dhcp.c \
$(LWIP)/core/ipv4/etharp.c \
$(LWIP)/core/ipv4/icmp.c \
$(LWIP)/core/ipv4/igmp.c \
$(LWIP)/core/ipv4/ip4_frag.c \
$(LWIP)/core/ipv4/ip4.c \
$(LWIP)/core/ipv4/ip4_addr.c
#LOCAL_SRC_FILES += $(LWIP)/core/ipv6/dhcp6.c \
# $(LWIP)/core/ipv6/ethip6.c \
# $(LWIP)/core/ipv6/icmp6.c \
# $(LWIP)/core/ipv6/inet6.c \
# $(LWIP)/core/ipv6/ip6.c \
# $(LWIP)/core/ipv6/ip6_addr.c \
# $(LWIP)/core/ipv6/ip6_frag.c \
# $(LWIP)/core/ipv6/mld6.c \
# $(LWIP)/core/ipv6/nd6.c
# lwIP core/ip4 files
LOCAL_SRC_FILES += \
$(ZT)/ext/lwip/src/core/ipv4/autoip.c \
$(ZT)/ext/lwip/src/core/ipv4/icmp.c \
$(ZT)/ext/lwip/src/core/ipv4/igmp.c \
$(ZT)/ext/lwip/src/core/ipv4/inet_chksum.c \
$(ZT)/ext/lwip/src/core/ipv4/inet.c \
$(ZT)/ext/lwip/src/core/ipv4/ip_addr.c \
$(ZT)/ext/lwip/src/core/ipv4/ip_frag.c \
$(ZT)/ext/lwip/src/core/ipv4/ip.c \
# lwIP netif files
LOCAL_SRC_FILES += \
$(ZT)/ext/lwip/src/netif/etharp.c \
$(ZT)/ext/lwip/src/netif/ethernetif.c \
$(ZT)/ext/lwip/src/netif/slipif.c
$(LWIP)/netif/ethernetif.c \
$(LWIP)/netif/ethernet.c
# Netcon files
LOCAL_SRC_FILES += \
$(ZTSDK)/src/rpc.c \
$(ZTSDK)/src/proxy.cpp \
$(ZTSDK)/src/sockets.c \
$(ZTSDK)/src/service.cpp \
$(ZTSDK)/src/tap.cpp \
$(ZTSDK)/src/stack_drivers/lwip/lwip.cpp
# JNI Files
LOCAL_SRC_FILES += \
com_zerotierone_sdk_Node.cpp \
ZT_jniutils.cpp \
ZT_jnilookup.cpp
#LOCAL_SRC_FILES += \
# com_zerotierone_sdk_Node.cpp \
# ZT_jniutils.cpp \
# ZT_jnilookup.cpp
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_SHARED_LIBRARY)

121
integrations/android/android_jni_lib/java/jni/Android.pico.mk Normal file
View File

@@ -0,0 +1,121 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
ZTSDK := $(ZT1)/..
ZT := $(ZTSDK)/zerotierone
PICO := $(ZTSDK)/ext/picotcp
LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(PICO)/modules
LOCAL_C_INCLUDES += $(PICO)/include
LOCAL_C_INCLUDES += $(PICO)/build/include
LOCAL_C_INCLUDES += $(PICO)/build/include/arch
LOCAL_C_INCLUDES += $(ZTSDK)/src
LOCAL_C_INCLUDES += $(ZTSDK)/src/stack_drivers/picotcp
LOCAL_C_INCLUDES += $(ZTSDK)/src/stack_drivers
LOCAL_C_INCLUDES += $(ZT1)/include
LOCAL_C_INCLUDES += $(ZT1)/node
LOCAL_C_INCLUDES += $(ZT1)/
LOCAL_C_INCLUDES += $(ZT1)/service
LOCAL_C_INCLUDES += $(ZT1)/osdep
LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g
# ZeroTierOne ext files
LOCAL_SRC_FILES := \
$(ZT1)/ext/lz4/lz4.c \
$(ZT1)/ext/json-parser/json.c \
$(ZT1)/ext/http-parser/http_parser.c \
# ZeroTierOne files
LOCAL_SRC_FILES += \
$(ZT1)/service/OneService.cpp \
$(ZT1)/service/ControlPlane.cpp \
$(ZT1)/node/C25519.cpp \
$(ZT1)/node/CertificateOfMembership.cpp \
$(ZT1)/node/DeferredPackets.cpp \
$(ZT1)/node/Identity.cpp \
$(ZT1)/node/IncomingPacket.cpp \
$(ZT1)/node/InetAddress.cpp \
$(ZT1)/node/Multicaster.cpp \
$(ZT)/node/Network.cpp \
$(ZT)/node/NetworkConfig.cpp \
$(ZT)/node/Node.cpp \
$(ZT)/node/OutboundMulticast.cpp \
$(ZT)/node/Packet.cpp \
$(ZT)/node/Path.cpp \
$(ZT)/node/Peer.cpp \
$(ZT)/node/Poly1305.cpp \
$(ZT)/node/Salsa20.cpp \
$(ZT)/node/SelfAwareness.cpp \
$(ZT)/node/SHA512.cpp \
$(ZT)/node/Switch.cpp \
$(ZT)/node/Topology.cpp \
$(ZT)/node/Utils.cpp \
$(ZT)/osdep/Http.cpp \
$(ZT)/osdep/OSUtils.cpp \
$(ZT)/osdep/ManagedRoute.cpp \
$(ZT)/osdep/BackgroundResolver.cpp
# picoTCP files
LOCAL_SRC_FILES += \
$(PICO)/stack/pico_device.c \
$(PICO)/stack/pico_frame.c \
$(PICO)/stack/pico_md5.c \
$(PICO)/stack/pico_protocol.c \
$(PICO)/stack/pico_socket_multicast.c \
$(PICO)/stack/pico_socket.c \
$(PICO)/stack/pico_stack.c \
$(PICO)/stack/pico_tree.c \
# picoTCP files
LOCAL_SRC_FILES += \
$(PICO)/modules/pico_aodv.c \
$(PICO)/modules/pico_arp.c \
$(PICO)/modules/pico_dev_loop.c \
$(PICO)/modules/pico_dev_mock.c \
$(PICO)/modules/pico_dev_null.c \
$(PICO)/modules/pico_dev_tun.c \
$(PICO)/modules/pico_dns_client.c \
$(PICO)/modules/pico_dns_common.c \
$(PICO)/modules/pico_dns_sd.c \
$(PICO)/modules/pico_fragments.c \
$(PICO)/modules/pico_hotplug_detection.c \
$(PICO)/modules/pico_icmp4.c \
$(PICO)/modules/pico_icmp6.c \
$(PICO)/modules/pico_igmp.c \
$(PICO)/modules/pico_ipfilter.c \
$(PICO)/modules/pico_ipv4.c \
$(PICO)/modules/pico_ipv6_nd.c \
$(PICO)/modules/pico_ipv6.c \
$(PICO)/modules/pico_mdns.c \
$(PICO)/modules/pico_mld.c \
$(PICO)/modules/pico_mm.c \
$(PICO)/modules/pico_nat.c \
$(PICO)/modules/pico_olsr.c \
$(PICO)/modules/pico_posix.c \
$(PICO)/modules/pico_slaacv4.c \
$(PICO)/modules/pico_sntp_client.c \
$(PICO)/modules/pico_socket_tcp.c \
$(PICO)/modules/pico_socket_udp.c \
$(PICO)/modules/pico_strings.c \
$(PICO)/modules/pico_tcp.c \
$(PICO)/modules/pico_tftp.c \
$(PICO)/modules/pico_udp.c
# Netcon files
LOCAL_SRC_FILES += \
$(ZTSDK)/src/rpc.c \
$(ZTSDK)/src/proxy.cpp \
$(ZTSDK)/src/sockets.c \
$(ZTSDK)/src/service.cpp \
$(ZTSDK)/src/tap.cpp \
$(ZTSDK)/src/stack_drivers/picotcp/picotcp.cpp
include $(BUILD_SHARED_LIBRARY)

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

@@ -1,7 +1,7 @@
NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static
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_CPPFLAGS := -D__ANDROID__ -v -g -O3 -DSDK_BUNDLED -DSDK_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 := -v -g -DSDK_BUNDLED
APP_PLATFORM := android-14
# Architectures
@@ -13,4 +13,4 @@ APP_ABI += armeabi-v7a
#APP_ABI += mips
#APP_ABI += mips64
#APP_ABI += x86
#APP_ABI += x86_64
#APP_ABI += x86_64

16
integrations/android/android_jni_lib/java/jni/Application.pico.mk Normal file
View File

@@ -0,0 +1,16 @@
NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static
APP_CPPFLAGS := -v -g -O3 -DSDK_BUNDLED -DSDK_DEBUG -PICO_SUPPORT_IPV4=1 -DPICO_SUPPORT_TCP=1 -DSDK_PICOTCP=1 -DSDK_IPV4=1 -DIPV4=1 -DIPV6=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
# Architectures
# APP_ABI := all
#APP_ABI += arm64-v8a
#APP_ABI += armeabi
APP_ABI += armeabi-v7a
#APP_ABI += mips
#APP_ABI += mips64
#APP_ABI += x86
#APP_ABI += x86_64