Port server core to Android
* Android libutils locks and threads
* Add Android.mk for building with AOSP
* Add logger sink for Android
* Regenerate Android.mk when CMake is run
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index 8e532a2..1dae61b 100644
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -62,7 +62,8 @@
ZRLEEncoder.cxx
ZRLEDecoder.cxx
encodings.cxx
- util.cxx)
+ util.cxx
+ PARENT_SCOPE)
if(UNIX)
set(RFB_SOURCES ${RFB_SOURCES} Logger_syslog.cxx)
diff --git a/common/rfb/Logger_android.cxx b/common/rfb/Logger_android.cxx
new file mode 100644
index 0000000..324607a
--- /dev/null
+++ b/common/rfb/Logger_android.cxx
@@ -0,0 +1,60 @@
+/* Copyright (C) 2015 TigerVNC
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+
+// -=- Logger_android.cxx - Logger instance for Android's logd
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <utils/Log.h>
+
+#include <rfb/util.h>
+#include <rfb/Logger_android.h>
+#include <rfb/LogWriter.h>
+
+using namespace rfb;
+
+
+Logger_Android::Logger_Android(const char* loggerName)
+ : Logger(loggerName)
+{
+}
+
+Logger_Android::~Logger_Android()
+{
+}
+
+void Logger_Android::write(int level, const char *logname, const char *message)
+{
+ // Convert our priority level into Android log level
+ if (level >= LogWriter::LEVEL_DEBUG) {
+ ALOGD("%s: %s", logname, message);
+ } else if (level >= LogWriter::LEVEL_INFO) {
+ ALOGI("%s: %s", logname, message);
+ } else if (level >= LogWriter::LEVEL_STATUS) {
+ ALOGW("%s: %s", logname, message);
+ } else {
+ ALOGE("%s: %s", logname, message);
+ }
+}
+
+static Logger_Android logger("android");
+
+void rfb::initAndroidLogger() {
+ logger.registerLogger();
+}
diff --git a/common/rfb/Logger_android.h b/common/rfb/Logger_android.h
new file mode 100644
index 0000000..ac1a7fe
--- /dev/null
+++ b/common/rfb/Logger_android.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 2015 TigerVNC
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+
+// -=- Logger_android - log to Android's logd
+
+#ifndef __RFB_LOGGER_ANDROID_H__
+#define __RFB_LOGGER_ANDROID_H__
+
+#include <time.h>
+#include <rfb/Logger.h>
+
+namespace rfb {
+
+ class Logger_Android : public Logger {
+ public:
+ Logger_Android(const char* loggerName);
+ virtual ~Logger_Android();
+
+ virtual void write(int level, const char *logname, const char *message);
+ };
+
+ void initAndroidLogger();
+};
+
+#endif