1 files changed, 9 insertions, 1 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index edf6f61..4879766 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,10 @@
 
 #include <cstdio>
 
+#if defined(SWIFT_ANDROID_LOGGING) && defined(__ANDROID__)
+#include <android/log.h>
+#endif
+
 
 namespace Swift {
 
@@ -17,9 +21,13 @@ Log::Log() {
 }
 
 Log::~Log() {
+#if defined(SWIFT_ANDROID_LOGGING) && defined(__ANDROID__)
+	__android_log_print(ANDROID_LOG_VERBOSE, "Swift", stream.str().c_str(), 1);
+#else
 	// Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
 	fprintf(stderr, "%s", stream.str().c_str());
 	fflush(stderr);
+#endif
 }
 
 std::ostringstream& Log::getStream(