From 71ae6789300858760df8115c48cc034bb86d0144 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 22 Apr 2019 11:35:35 -0700 Subject: Make things compile with Android NDK again --- java/jni/Android.mk | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'java/jni/Android.mk') diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 8cda2474..f018950d 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -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 += \ -- cgit v1.2.3