android: Add missing libintl.so to APK.

[pulseview.git] / android / loghandler.cpp

diff --git a/android/loghandler.cpp b/android/loghandler.cpp
index b50242041bcc3a4171038defea48765eb440ee5e..0b99b049d36bde0b67806e4f555fa028001488f9 100644 (file)
--- a/android/loghandler.cpp
+++ b/android/loghandler.cpp
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 
-#include "android/loghandler.h"
+#include "android/loghandler.hpp"
 
 namespace pv {
 
@@ -47,12 +47,12 @@ int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *form
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > sr_log_loglevel_get())
-               return SR_OK; /* TODO? */
+               return SR_OK;
 
        if (loglevel < SR_LOG_NONE)
-         loglevel = SR_LOG_NONE;
+               loglevel = SR_LOG_NONE;
        else if (loglevel > SR_LOG_SPEW)
-         loglevel = SR_LOG_SPEW;
+               loglevel = SR_LOG_SPEW;
 
        ret = __android_log_vprint(prio[loglevel], "sr", format, args);
 
@@ -77,12 +77,12 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > srd_log_loglevel_get())
-               return SRD_OK; /* TODO? */
+               return SRD_OK;
 
        if (loglevel < SRD_LOG_NONE)
-         loglevel = SRD_LOG_NONE;
+               loglevel = SRD_LOG_NONE;
        else if (loglevel > SRD_LOG_SPEW)
-         loglevel = SRD_LOG_SPEW;
+               loglevel = SRD_LOG_SPEW;
 
        ret = __android_log_vprint(prio[loglevel], "srd", format, args);
 
@@ -101,4 +101,3 @@ void AndroidLogHandler::install_callbacks()
 }
 
 } // namespace pv
-