diff options
Diffstat (limited to 'src/LoggerListeners.cpp')
| -rw-r--r-- | src/LoggerListeners.cpp | 53 |
1 files changed, 5 insertions, 48 deletions
diff --git a/src/LoggerListeners.cpp b/src/LoggerListeners.cpp index 1d6d9c6ce..91f166bda 100644 --- a/src/LoggerListeners.cpp +++ b/src/LoggerListeners.cpp @@ -8,14 +8,12 @@ #if defined(_WIN32) #include <io.h> // Needed for _isatty(), not available on Linux #include <time.h> -#elif defined(__linux) && !defined(ANDROID_NDK) +#elif defined(__linux) #include <unistd.h> // Needed for isatty() on Linux -#elif defined(ANDROID_NDK) - #include <android/log.h> #endif -#if defined(_WIN32) || (defined (__linux) && !defined(ANDROID_NDK)) +#if defined(_WIN32) || defined (__linux) class cColouredConsoleListener : public cLogger::cListener { @@ -107,7 +105,7 @@ -#elif defined (__linux) && !defined(ANDROID_NDK) +#elif defined (__linux) @@ -154,46 +152,6 @@ } }; - - -#elif defined(ANDROID_NDK) - - - - class cAndroidConsoleListener - : public cLogger::cListener - { - public: - virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override - { - android_LogPriority AndroidLogLevel; - switch (a_LogLevel) - { - case cLogger::llRegular: - { - AndroidLogLevel = ANDROID_LOG_VERBOSE; - break; - } - case cLogger::llInfo: - { - AndroidLogLevel = ANDROID_LOG_INFO; - break; - } - case cLogger::llWarning: - { - AndroidLogLevel = ANDROID_LOG_WARNING; - break; - } - case cLogger::llError: - { - AndroidLogLevel = ANDROID_LOG_ERROR; - break; - } - } - __android_log_print(AndroidLogLevel, "Cuberite", "%s", a_Message.c_str()); - } - }; - #endif @@ -273,8 +231,7 @@ std::unique_ptr<cLogger::cListener> MakeConsoleListener(bool a_IsService) { return cpp14::make_unique<cVanillaCPPConsoleListener>(); } - - #elif defined (__linux) && !defined(ANDROID_NDK) + #elif defined (__linux) && !defined(ANDROID) // TODO: lookup terminal in terminfo if (isatty(fileno(stdout))) { @@ -306,7 +263,7 @@ public: bool Open() { // Assume creation succeeds, as the API does not provide a way to tell if the folder exists. - cFile::CreateFolder(FILE_IO_PREFIX + AString("logs")); + cFile::CreateFolder(FILE_IO_PREFIX "logs"); bool success = m_File.Open( FILE_IO_PREFIX + Printf( "logs/LOG_%d.txt", |