ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-06 11:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make things compile with Android NDK again

Browse Source
This commit is contained in:
Grant Limberg 2019-04-22 11:35:35 -07:00
parent 6a027c9c0a
commit 71ae678930
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java/jni/Android.mk
View File

@ -6,11 +6,9 @@ LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(ZT1)/include \ $(ZT1)/include \
$(ZT1)/node \ $(ZT1)/node \
$(ZT1)/osdep \ $(ZT1)/osdep
$(ZT1)/ext/miniupnpc \
$(ZT1)/ext/libnatpmp
LOCAL_LDLIBS := -llog -latomic LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g # LOCAL_CFLAGS := -g
LOCAL_CFLAGS := -DZT_USE_MINIUPNPC LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
@ -43,26 +41,7 @@ LOCAL_SRC_FILES := \
$(ZT1)/node/Topology.cpp \ $(ZT1)/node/Topology.cpp \
$(ZT1)/node/Trace.cpp \ $(ZT1)/node/Trace.cpp \
$(ZT1)/node/Utils.cpp \ $(ZT1)/node/Utils.cpp \
$(ZT1)/osdep/OSUtils.cpp \ $(ZT1)/osdep/OSUtils.cpp
$(ZT1)/osdep/PortMapper.cpp
# libminiupnpc and libnatpmp files
LOCAL_SRC_FILES += \
$(ZT1)/ext/miniupnpc/connecthostport.c \
$(ZT1)/ext/miniupnpc/igd_desc_parse.c \
$(ZT1)/ext/miniupnpc/minisoap.c \
$(ZT1)/ext/miniupnpc/minissdpc.c \
$(ZT1)/ext/miniupnpc/miniupnpc.c \
$(ZT1)/ext/miniupnpc/miniwget.c \
$(ZT1)/ext/miniupnpc/minixml.c \
$(ZT1)/ext/miniupnpc/portlistingparse.c \
$(ZT1)/ext/miniupnpc/receivedata.c \
$(ZT1)/ext/miniupnpc/upnpcommands.c \
$(ZT1)/ext/miniupnpc/upnpdev.c \
$(ZT1)/ext/miniupnpc/upnperrors.c \
$(ZT1)/ext/miniupnpc/upnpreplyparse.c \
$(ZT1)/ext/libnatpmp/natpmp.c \
$(ZT1)/ext/libnatpmp/getgateway.c
# JNI Files # JNI Files
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \

2
java/jni/Application.mk
View File

@ -1,5 +1,5 @@
# NDK_TOOLCHAIN_VERSION := clang3.5 # NDK_TOOLCHAIN_VERSION := clang3.5
APP_STL := c++_static APP_STL := c++_static
APP_CPPFLAGS := -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 APP_CPPFLAGS := -Wall -fstack-protector -fexceptions -fno-strict-aliasing -frtti -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_PLATFORM := android-14 APP_PLATFORM := android-14
APP_ABI := all APP_ABI := all

13
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -32,8 +32,6 @@
#include <ZeroTierOne.h> #include <ZeroTierOne.h>
#include "Mutex.hpp" #include "Mutex.hpp"
#include "PortMapper.hpp"
#include <map> #include <map>
#include <string> #include <string>
#include <assert.h> #include <assert.h>
@ -60,7 +58,6 @@ namespace {
, configListener(NULL) , configListener(NULL)
, pathChecker(NULL) , pathChecker(NULL)
, callbacks(NULL) , callbacks(NULL)
, portMapper(NULL)
{ {
callbacks = (ZT_Node_Callbacks*)malloc(sizeof(ZT_Node_Callbacks)); callbacks = (ZT_Node_Callbacks*)malloc(sizeof(ZT_Node_Callbacks));
memset(callbacks, 0, sizeof(ZT_Node_Callbacks)); memset(callbacks, 0, sizeof(ZT_Node_Callbacks));
@ -81,9 +78,6 @@ namespace {
free(callbacks); free(callbacks);
callbacks = NULL; callbacks = NULL;
delete portMapper;
portMapper = NULL;
} }
int64_t id; int64_t id;
@ -101,8 +95,6 @@ namespace {
jobject pathChecker; jobject pathChecker;
ZT_Node_Callbacks *callbacks; ZT_Node_Callbacks *callbacks;
ZeroTier::PortMapper *portMapper;
}; };
@ -881,11 +873,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
} }
uint64_t nodeId = ZT_Node_address(node); uint64_t nodeId = ZT_Node_address(node);
if (nodeId != 0) {
char uniqueName[64];
snprintf(uniqueName, sizeof(uniqueName), "ZeroTier Android/%.10llx@%u", (unsigned long long)nodeId, 9993);
ref->portMapper = new ZeroTier::PortMapper(9993, uniqueName);
}
ZeroTier::Mutex::Lock lock(nodeMapMutex); ZeroTier::Mutex::Lock lock(nodeMapMutex);
ref->node = node; ref->node = node;