Landing patch set 7 from https://codereview.chromium.org/1450113003/

runtime/bin/process_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/process.h"
 
 #include <errno.h>  // NOLINT
 #include <fcntl.h>  // NOLINT
 #include <poll.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
 #include <string.h>  // NOLINT
 #include <sys/wait.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 
 #include "bin/fdutils.h"
 #include "bin/lockers.h"
 #include "bin/log.h"
 #include "bin/thread.h"
 
 #include "platform/signal_blocker.h"
+#include "platform/utils.h"
 
 
 extern char **environ;
 
 
 namespace dart {
 namespace bin {
 
 // ProcessInfo is used to map a process id to the file descriptor for
 // the pipe used to communicate the exit code of the process to Dart.
@@ skipping 602 matching lines @@
     if (actual_errno == 0) actual_errno = EPERM;
     SetChildOsErrorMessage();
     CloseAllPipes();
     return actual_errno;
   }
 
 
   void SetChildOsErrorMessage() {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
-    strerror_r(errno, error_message, kBufferSize);
+    Utils::StrError(errno, error_message, kBufferSize);
     *os_error_message_ = strdup(error_message);
   }
 
 
   void ReportChildError() {
     // In the case of failure in the child process write the errno and
     // the OS error message to the exec control pipe and exit.
     int child_errno = errno;
     const int kBufferSize = 1024;
     char os_error_message[kBufferSize];
-    strerror_r(errno, os_error_message, kBufferSize);
+    Utils::StrError(errno, os_error_message, kBufferSize);
     int bytes_written =
         FDUtils::WriteToBlocking(
             exec_control_[1], &child_errno, sizeof(child_errno));
     if (bytes_written == sizeof(child_errno)) {
       FDUtils::WriteToBlocking(
           exec_control_[1], os_error_message, strlen(os_error_message) + 1);
     }
     VOID_TEMP_FAILURE_RETRY(close(exec_control_[1]));
     exit(1);
   }
@@ skipping 329 matching lines @@
     bzero(&act, sizeof(act));
     act.sa_handler = SIG_DFL;
     VOID_NO_RETRY_EXPECTED(sigaction(signal, &act, NULL));
   }
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)