github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 02:27:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make things compile with Android NDK again

Browse source
This commit is contained in:
Grant Limberg 2019-04-22 11:35:35 -07:00
commit 71ae678930
3 changed files with 4 additions and 38 deletions
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 := \
$(ZT1)/include \
$(ZT1)/node \
$(ZT1)/osdep \
$(ZT1)/ext/miniupnpc \
$(ZT1)/ext/libnatpmp
$(ZT1)/osdep
LOCAL_LDLIBS := -llog -latomic
LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g
LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
@ -43,26 +41,7 @@ LOCAL_SRC_FILES := \
$(ZT1)/node/Topology.cpp \
$(ZT1)/node/Trace.cpp \
$(ZT1)/node/Utils.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
$(ZT1)/osdep/OSUtils.cpp
# JNI Files
LOCAL_SRC_FILES += \