Merge branch 'feature/logger'

Makefile

@@ -35,6 +35,7 @@ javah:
 	@echo "Creating header files in jni using $(JAVAH)..."
 	@cd jni && $(JAVAH) -cp ../java $(PACKAGE).sync.OoniSyncApi
 	@cd jni && $(JAVAH) -cp ../java $(PACKAGE).sync.PortolanSyncApi
+	@cd jni && $(JAVAH) -cp ../java $(PACKAGE).LoggerApi
 
 jni-libs-no-unpack:
 	$(NDK_BUILD) NDK_LIBS_OUT=./jniLibs

java/io/github/measurement_kit/jni/LoggerApi.java

@@ -0,0 +1,22 @@
+// Part of measurement-kit <https://measurement-kit.github.io/>.
+// Measurement-kit is free software. See AUTHORS and LICENSE for more
+// information on the copying conditions.
+
+package io.github.measurement_kit.jni;
+
+/**
+ * Access to MeasurementKit Logger functionality
+ */
+public class LoggerApi {
+
+    /**
+     * Control verbosity of the default logger.
+     * @param verbose Make verbose if true, quiet if false.
+     */
+    public static native void setVerbose(int verbose);
+
+    /**
+     * Redirect default logger's output to Android logcat.
+     */
+    public static native void useAndroidLogger();
+}

jni/Android.mk

@@ -28,9 +28,10 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -llog -latomic
 LOCAL_STATIC_LIBRARIES := measurement_kit event event_pthreads jansson \
-			  maxminddb yaml-cpp
+                          maxminddb yaml-cpp
 LOCAL_MODULE := measurement_kit_jni
-LOCAL_SRC_FILES := common.cpp ooni_sync_api.cpp portolan_sync_api.cpp
+LOCAL_SRC_FILES := common.cpp logger_api.cpp ooni_sync_api.cpp \
+                   portolan_sync_api.cpp
 APP_PLATFORM := android-21
 LOCAL_CPPFLAGS += -I jni/$(TARGET_ARCH_ABI)/include -std=c++11
 include $(BUILD_SHARED_LIBRARY)