Add Android support #374
Add Android support #374
Conversation
| @@ -157,6 +162,10 @@ include_directories( | |||
| ${UTEMPTER_INCLUDE_DIR} | |||
| ) | |||
|
|
|||
| IF(NOT ANDROID) | |||
| include_directories( external/UniversalStacktrace/ust ) | |||
There was a problem hiding this comment.
No libexecinfo on Android.
There was a problem hiding this comment.
ust uses libunwind now, can you try latest master and tell me what error you get if any?
There was a problem hiding this comment.
Doesn't seem to work, as Android uses the LLVM libunwind but UniversalStacktrace seems to expect the nongnu one? I get errors about missing symbols like UNW_REG_IP when compiling, after changing external/UniversalStacktrace/ust/ust.hpp to include unwind.h instead of libunwind.h.
| @@ -288,7 +296,7 @@ inline string GetTempDirectory() { | |||
| std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter; | |||
| std::string tmpDir = converter.to_bytes(wstring(buf, retval)); | |||
| #else | |||
| string tmpDir = "/tmp"; | |||
| string tmpDir = _PATH_TMP; | |||
There was a problem hiding this comment.
Adds a trailing slash, the Windows one may need to be checked for that.
| @@ -12,7 +12,7 @@ int TcpSocketHandler::connect(const SocketEndpoint &endpoint) { | |||
| memset(&hints, 0, sizeof(addrinfo)); | |||
| hints.ai_family = AF_UNSPEC; | |||
| hints.ai_socktype = SOCK_STREAM; | |||
| #if __NetBSD__ | |||
| #if defined(__NetBSD__) || defined(__ANDROID__) | |||
| hints.ai_flags = (AI_CANONNAME | AI_ADDRCONFIG); | |||
There was a problem hiding this comment.
As noted on SO, Android doesn't support these flags just like BSD, which is where its source comes from.
| @@ -34,6 +34,8 @@ | |||
| #include <sys/time.h> | |||
| #endif /* HAVE_SYS_TIME_H */ | |||
|
|
|||
| #include "Headers.hpp" | |||
There was a problem hiding this comment.
This was missing when cross-compiling to Android, but is reproducible on linux too if cotire is turned off. I guess precompiling the headers pulls in other headers that weren't included originally.
| @@ -157,6 +162,10 @@ include_directories( | |||
| ${UTEMPTER_INCLUDE_DIR} | |||
| ) | |||
|
|
|||
| IF(NOT ANDROID) | |||
| include_directories( external/UniversalStacktrace/ust ) | |||
There was a problem hiding this comment.
ust uses libunwind now, can you try latest master and tell me what error you get if any?
| @@ -64,9 +64,9 @@ int main(int argc, char** argv) { | |||
| el::Loggers::setVerboseLevel(3); | |||
| // default max log file size is 20MB for etserver | |||
| string maxlogsize = "20971520"; | |||
| LogHandler::setupLogFile(&defaultConf, "/tmp/htm.log", maxlogsize); | |||
| LogHandler::setupLogFile(&defaultConf, GetTempDirectory() + "htm.log", maxlogsize); | |||
|
Updated to replace |
|
I found the cause of |
Works both completely locally in Termux without root, and when connecting to a linux server. Only remaining issue is that
etserver --helpdoesn't work: I think that's becausecxxoptsis incompatible with LLVM libc++, as this patch runs fine on linux x86_64 with GNU libstdc++. I will look into that and patch that last bug later.