Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow compilation on android (#7386)

Browse Source
This commit is contained in:
Thad House
2024-11-12 16:39:41 -08:00
committed by GitHub
parent 07345712dc
commit c289562a06
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpinet/CMakeLists.txt
View File

@@ -202,7 +202,7 @@ foreach(example ${wpinet_examples})
endif()
endforeach()
if(UNIX AND NOT APPLE)
if(UNIX AND NOT APPLE AND NOT ANDROID)
set(LIBUTIL -lutil)
else()
set(LIBUTIL)

2
wpinet/examples/dsclient/dsclient.cpp
View File

@@ -32,5 +32,5 @@ int main() {
});
// wait for a keypress to terminate
std::getchar();
static_cast<void>(std::getchar());
}

2
wpinet/examples/parallelconnect/parallelconnect.cpp
View File

@@ -48,5 +48,5 @@ int main() {
});
// wait for a keypress to terminate
std::getchar();
static_cast<void>(std::getchar());
}

2
wpinet/examples/webserver/webserver.cpp
View File

@@ -85,5 +85,5 @@ int main() {
});
// wait for a keypress to terminate
std::getchar();
static_cast<void>(std::getchar());
}

5
wpiutil/src/main/native/unix/StackTrace.cpp
View File

@@ -16,6 +16,7 @@
namespace wpi {
std::string GetStackTraceDefault(int offset) {
#ifndef __ANDROID__
void* stackTrace[128];
int stackSize = backtrace(stackTrace, 128);
char** mangledSymbols = backtrace_symbols(stackTrace, stackSize);
@@ -38,6 +39,10 @@ std::string GetStackTraceDefault(int offset) {
std::free(mangledSymbols);
return std::string{trace.str()};
#else
// backtrace_symbols not supported on android
return "";
#endif
}
} // namespace wpi