Update Android samples

CMakeLists.txt

@@ -16,6 +16,10 @@ target_include_directories(plog
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
+if(ANDROID)
+    target_link_libraries(plog INTERFACE log)
+endif()
+
 add_library(plog::plog ALIAS plog)
 
 #making sure we can build standalone under windows

samples/Android/jni/Sample.cpp → samples/Android/AndroidJNI/Main.cpp

@@ -1,5 +1,5 @@
 //
-// Android - shows how to use the android-specific appender.
+// AndroidJNI - shows how to use the Android appender in JNI.
 //
 
 #include <jni.h>
@@ -8,11 +8,15 @@
 #include <plog/Appenders/AndroidAppender.h>
 #include <plog/Formatters/FuncMessageFormatter.h>
 
-extern "C" void Java_com_github_sergius_myapp_Sample_foo(JNIEnv* env, jobject obj)
+extern "C" jint JNI_Onload(JavaVM*, void*)
 {
-    // For simplicity the logger is initialized here. But the good place is JNI_OnLoad.
     static plog::AndroidAppender<plog::FuncMessageFormatter> appender("MyApp"); // Create an appender and set a log tag.
-    static plog::Logger<0>& logger = plog::init(plog::debug, &appender); // Initialize the logger with the appender.
+    plog::init(plog::debug, &appender); // Initialize the logger with the appender.
 
+    return JNI_VERSION_1_6;
+}
+
+extern "C" void Java_com_github_sergius_myapp_Sample_foo(JNIEnv*, jobject)
+{
     PLOGD << "Hello Android!";
 }

samples/Android/AndroidNative/Main.cpp

@@ -0,0 +1,23 @@
+//
+// AndroidNative - shows how to use an Android appender.
+//
+
+#include <plog/Log.h>
+#include <plog/Init.h>
+#include <plog/Formatters/TxtFormatter.h>
+#include <plog/Appenders/AndroidAppender.h>
+
+int main()
+{
+    static plog::AndroidAppender<plog::TxtFormatter> androidAppender("app");
+    plog::init(plog::verbose, &androidAppender);
+
+    PLOG_VERBOSE << "This is a VERBOSE message";
+    PLOG_DEBUG << "This is a DEBUG message";
+    PLOG_INFO << "This is an INFO message";
+    PLOG_WARNING << "This is a WARNING message";
+    PLOG_ERROR << "This is an ERROR message";
+    PLOG_FATAL << "This is a FATAL message";
+
+    return 0;
+}

samples/Android/CMakeLists.txt

@@ -1,2 +1,13 @@
-add_custom_target(Android SOURCES jni/Sample.cpp)
-set_target_properties(Android PROPERTIES FOLDER Samples)
+if(ANDROID)
+    add_library(AndroidJNI SHARED AndroidJNI/Main.cpp)
+    target_link_libraries(AndroidJNI plog)
+
+    add_executable(AndroidNative AndroidNative/Main.cpp)
+    target_link_libraries(AndroidNative plog)
+else()
+    add_custom_target(AndroidJNI SOURCES AndroidJNI/Main.cpp)
+    add_custom_target(AndroidNative SOURCES AndroidNative/Main.cpp)
+endif()
+
+set_target_properties(AndroidJNI PROPERTIES FOLDER Samples/Android)
+set_target_properties(AndroidNative PROPERTIES FOLDER Samples/Android)