ZT/ZTS api layer updates, combined contents of SDK_ServiceSetup.h with SDK.h

2016-08-15 17:29:02 -07:00
parent 74c5245aa8
commit 6090138428
13 changed files with 417 additions and 139 deletions
--- a/integrations/android/android_jni_lib/java/jni/Android.mk
+++ b/integrations/android/android_jni_lib/java/jni/Android.mk
@@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \
 	$(ZTSDK)/SDK_Proxy.cpp \
 	$(ZTSDK)/SDK_Sockets.c \
 	$(ZTSDK)/SDK_Debug.c \
-	$(ZTSDK)/SDK_ServiceSetup.cpp \
+	$(ZTSDK)/SDK_Service.cpp \
 	$(ZTSDK)/SDK_EthernetTap.cpp

 # ZeroTierOne ext files