- fixes for Android build mostly

This commit is contained in:
2023-05-22 11:01:44 +03:00
parent 65e27eec0b
commit 7653fcf138
6 changed files with 114 additions and 40 deletions

View File

@@ -34,9 +34,10 @@ set (ICE_STACK_SOURCES ICEAddress.cpp
ICETime.cpp
ICETransactionList.cpp)
if (ANDROID_ABI)
set (ICE_STACK_SOURCES ${ICE_STACK_SOURCES} android-ifaddrs/android-ifaddrs.h android-ifaddrs/android-ifaddrs.c)
endif()
#if (ANDROID_ABI)
# set (ICE_STACK_SOURCES ${ICE_STACK_SOURCES} android-ifaddrs/android-ifaddrs.h android-ifaddrs/android-ifaddrs.c)
#endif()
if (TARGET_MUSL)
add_definitions(-DTARGET_MUSL)

View File

@@ -26,7 +26,7 @@
# include <linux/in6.h>
# if defined(TARGET_ANDROID)
# if __ANDROID_API__ < 24
# include "android-ifaddrs/android-ifaddrs.h"
# error not supported for ANDROID_API < 24
# else
# include <ifaddrs.h>
# endif
@@ -161,6 +161,7 @@ void NetworkHelper::reload(int networkType)
fillUwpInterfaceList(AF_INET, networkType, mIPList);
fillUwpInterfaceList(AF_INET6, networkType, mIPList);
#else
// https://github.com/golang/go/issues/40569
struct ifaddrs* il = NULL;
if (getifaddrs(&il))
throw Exception(GETIFADDRS_FAILED, errno);