Allow compilation on android (#7386)

wpilibsuite · Nov 13, 2024 · c289562 · c289562
1 parent 0734571
commit c289562
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt
@@ -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)

diff --git a/wpinet/examples/dsclient/dsclient.cpp b/wpinet/examples/dsclient/dsclient.cpp
@@ -32,5 +32,5 @@ int main() {
   });
 
   // wait for a keypress to terminate
-  std::getchar();
+  static_cast<void>(std::getchar());
 }
diff --git a/wpinet/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp
@@ -48,5 +48,5 @@ int main() {
   });
 
   // wait for a keypress to terminate
-  std::getchar();
+  static_cast<void>(std::getchar());
 }
diff --git a/wpinet/examples/webserver/webserver.cpp b/wpinet/examples/webserver/webserver.cpp
@@ -85,5 +85,5 @@ int main() {
   });
 
   // wait for a keypress to terminate
-  std::getchar();
+  static_cast<void>(std::getchar());
 }
diff --git a/wpiutil/src/main/native/unix/StackTrace.cpp b/wpiutil/src/main/native/unix/StackTrace.cpp
@@ -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