| Index: mojo/edk/test/multiprocess_test_helper.cc
|
| diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/mojo/edk/test/multiprocess_test_helper.cc
|
| index 7098934faab777137424b63e800b8ebb5f7fa4e8..8de370af4b38535699b84dac127370b45689a5a3 100644
|
| --- a/mojo/edk/test/multiprocess_test_helper.cc
|
| +++ b/mojo/edk/test/multiprocess_test_helper.cc
|
| @@ -132,8 +132,14 @@ int MultiprocessTestHelper::WaitForChildShutdown() {
|
| CHECK(test_child_.IsValid());
|
|
|
| int rv = -1;
|
| +#if defined(OS_ANDROID)
|
| + // On Android, we need to use a special function to wait for the child.
|
| + CHECK(AndroidWaitForChildExitWithTimeout(
|
| + test_child_, TestTimeouts::action_timeout(), &rv));
|
| +#else
|
| CHECK(
|
| test_child_.WaitForExitWithTimeout(TestTimeouts::action_timeout(), &rv));
|
| +#endif
|
| test_child_.Close();
|
| return rv;
|
| }
|
|
|