Fix errors

Author: grynspan

Sources/Testing/ExitTests/SpawnProcess.swift

@@ -74,9 +74,9 @@ func spawnExecutable(
 ) throws -> ProcessID {
   // Darwin and Linux differ in their optionality for the posix_spawn types we
   // use, so use this typealias to paper over the differences.
-#if SWT_TARGET_OS_APPLE || os(FreeBSD) || os(OpenBSD)
+#if SWT_TARGET_OS_APPLE || os(FreeBSD) || os(OpenBSD) || os(Android)
   typealias P<T> = T?
-#elseif os(Linux) || os(Android)
+#elseif os(Linux)
   typealias P<T> = T
 #endif
 

Sources/_TestingInternals/include/Stubs.h

@@ -126,7 +126,6 @@ static char *_Nullable *_Null_unspecified swt_environ(void) {
 }
 #endif
 
-#if !defined(__ANDROID__)
 #if __has_include(<signal.h>) && defined(si_pid)
 /// Get the value of the `si_pid` field of a `siginfo_t` structure.
 ///
@@ -150,7 +149,6 @@ static int swt_siginfo_t_si_status(const siginfo_t *siginfo) {
   return siginfo->si_status;
 }
 #endif
-#endif
 
 /// Get the value of `EEXIST`.
 ///