Bladeren bron

AK+LibCore: Don't use unsupported features on Android

Andrew Kaster 1 jaar geleden
bovenliggende
commit
6e8f1549a3
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      AK/Assertions.cpp
  2. 1 1
      Userland/Libraries/LibCore/Process.cpp

+ 1 - 1
AK/Assertions.cpp

@@ -9,7 +9,7 @@
 #include <AK/Platform.h>
 #include <AK/Platform.h>
 #include <AK/StringView.h>
 #include <AK/StringView.h>
 
 
-#if defined(AK_OS_LINUX) || defined(AK_OS_BSD_GENERIC) || defined(AK_OS_SOLARIS)
+#if (defined(AK_OS_LINUX) && !defined(AK_OS_ANDROID)) || defined(AK_OS_BSD_GENERIC) || defined(AK_OS_SOLARIS)
 #    define EXECINFO_BACKTRACE
 #    define EXECINFO_BACKTRACE
 #endif
 #endif
 
 

+ 1 - 1
Userland/Libraries/LibCore/Process.cpp

@@ -118,7 +118,7 @@ ErrorOr<String> Process::get_name()
     if (rc != 0)
     if (rc != 0)
         return Error::from_syscall("get_process_name"sv, -rc);
         return Error::from_syscall("get_process_name"sv, -rc);
     return String::from_utf8(StringView { buffer, strlen(buffer) });
     return String::from_utf8(StringView { buffer, strlen(buffer) });
-#elif defined(AK_OS_LINUX)
+#elif defined(AK_OS_LINUX) && !defined(AK_OS_ANDROID)
     return String::from_utf8(StringView { program_invocation_name, strlen(program_invocation_name) });
     return String::from_utf8(StringView { program_invocation_name, strlen(program_invocation_name) });
 #elif defined(AK_OS_BSD_GENERIC)
 #elif defined(AK_OS_BSD_GENERIC)
     auto const* progname = getprogname();
     auto const* progname = getprogname();