Pārlūkot izejas kodu

Added logging to Android logcat

Grant Limberg 10 gadi atpakaļ
vecāks
revīzija
3bdbc6390f
2 mainītis faili ar 14 papildinājumiem un 0 dzēšanām
  1. 1 0
      java/jni/Android.mk
  2. 13 0
      java/jni/ZT1_jniutils.h

+ 1 - 0
java/jni/Android.mk

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

+ 13 - 0
java/jni/ZT1_jniutils.h

@@ -7,6 +7,19 @@
 extern "C" {
 #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 createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status);
 jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type);