espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-05 23:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[daemon] avoid using defined(__ANDROID__) macro in daemon.cpp (#10021)

Browse Source 
This commit replaces `defined(__ANDROID__) &&
!OPENTHREAD_CONFIG_ANDROID_NDK_ENABLE` macro checks with
`OPENTHREAD_POSIX_CONFIG_ANDROID_ENABLE`. This is to make the build
options more configurable. E.g. there are cases where `__ANDROID__` is
defined but the platform is not fully Android-compatible so we don't
want to enable the Android platform implementation.
This commit is contained in:
Handa Wang
2024-04-11 21:52:52 -07:00
committed by GitHub
parent 9d852a3b37
commit f72f27f0f7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/platform/daemon.cpp
+4 -4
View File
@@ -28,7 +28,7 @@
#include "posix/platform/daemon.hpp" #include "posix/platform/daemon.hpp"
#if defined(__ANDROID__) && !OPENTHREAD_CONFIG_ANDROID_NDK_ENABLE #if OPENTHREAD_POSIX_CONFIG_ANDROID_ENABLE
#include <cutils/sockets.h> #include <cutils/sockets.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@@ -174,7 +174,7 @@ exit:
} }
} }
#if defined(__ANDROID__) && !OPENTHREAD_CONFIG_ANDROID_NDK_ENABLE #if OPENTHREAD_POSIX_CONFIG_ANDROID_ENABLE
void Daemon::createListenSocketOrDie(void) void Daemon::createListenSocketOrDie(void)
{ {
Filename socketFile; Filename socketFile;
@@ -268,7 +268,7 @@ void Daemon::createListenSocketOrDie(void)
DieNowWithMessage("bind", OT_EXIT_ERROR_ERRNO); DieNowWithMessage("bind", OT_EXIT_ERROR_ERRNO);
} }
} }
#endif // defined(__ANDROID__) && !OPENTHREAD_CONFIG_ANDROID_NDK_ENABLE #endif // OPENTHREAD_POSIX_CONFIG_ANDROID_ENABLE
void Daemon::SetUp(void) void Daemon::SetUp(void)
{ {
@@ -307,7 +307,7 @@ void Daemon::TearDown(void)
mSessionSocket = -1; mSessionSocket = -1;
} }
#if !defined(__ANDROID__) || OPENTHREAD_CONFIG_ANDROID_NDK_ENABLE #if !OPENTHREAD_POSIX_CONFIG_ANDROID_ENABLE
// The `mListenSocket` is managed by `init` on Android // The `mListenSocket` is managed by `init` on Android
if (mListenSocket != -1) if (mListenSocket != -1)
{ {