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

Added logging to Android logcat

Browse Source
This commit is contained in:
Grant Limberg
2015-04-25 20:46:56 -07:00
parent 8a09e0ec3c
commit 3bdbc6390f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/jni/Android.mk
View File

@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := ZeroTierOneJNI LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(ZT1)/include LOCAL_C_INCLUDES := $(ZT1)/include
LOCAL_LDLIBS := -llog
# ZeroTierOne SDK source files # ZeroTierOne SDK source files
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \

13
java/jni/ZT1_jniutils.h
View File

@@ -7,6 +7,19 @@
extern "C" { extern "C" {
#endif #endif
#define LOG_TAG "ZeroTierOneJNI"
#if __ANDROID__
#include <android/log.h>
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
#else
#define LOGI(...)
#define LOGD(...)
#define LOGE(...)
#endif
jobject createResultObject(JNIEnv *env, ZT1_ResultCode code); jobject createResultObject(JNIEnv *env, ZT1_ResultCode code);
jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status); jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status);
jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type); jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type);