2022-01-22 07:52:21 +01:00
|
|
|
--- a/sdk/src/posix/net.cpp
|
|
|
|
|
+++ b/sdk/src/posix/net.cpp
|
|
|
|
|
@@ -23,7 +23,7 @@
|
|
|
|
|
#include "mega/posix/meganet.h"
|
|
|
|
|
#include "mega/logging.h"
|
|
|
|
|
|
|
|
|
|
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
|
2022-01-22 08:35:07 +01:00
|
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
|
2022-01-22 07:52:21 +01:00
|
|
|
#include <jni.h>
|
|
|
|
|
extern JavaVM *MEGAjvm;
|
|
|
|
|
#endif
|
|
|
|
|
@@ -288,7 +288,7 @@
|
|
|
|
|
ares_library_init(ARES_LIB_INIT_ALL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
|
2022-01-22 08:35:07 +01:00
|
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
|
2022-01-22 07:52:21 +01:00
|
|
|
initialize_android();
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -2852,7 +2852,7 @@
|
|
|
|
|
return (DNS_CACHE_EXPIRES && (Waiter::ds - ipv6timestamp) >= DNS_CACHE_TIMEOUT_DS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
|
2022-01-22 08:35:07 +01:00
|
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
|
2022-01-22 07:52:21 +01:00
|
|
|
void CurlHttpIO::initialize_android()
|
|
|
|
|
{
|
|
|
|
|
if (!MEGAjvm)
|
