diff options
| author | Lars Volker <lv@cloudera.com> | 2018-01-31 12:54:28 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2018-01-31 21:02:06 +0000 |
| commit | ac4a549e29fbc8fe58212380e41fa24f36e6c3ec (patch) | |
| tree | 1a1d1bc560a6a7ed74a9f33c67899a8d7d6fed2b /src/client/linux | |
| parent | Remove barrier to fix Android build. (diff) | |
| download | breakpad-ac4a549e29fbc8fe58212380e41fa24f36e6c3ec.tar.xz | |
Extend ifdef to include helper functions
The previous change to fix compiling on Android < N forgot to include a
helper in the ifdef, thus not fixing the problem. This change extends
the ifdef to include all helpers used by the test.
Change-Id: Ibb3030f54a81b5609a0b55ccef387a3cba22d088
Reviewed-on: https://chromium-review.googlesource.com/895240
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/client/linux')
| -rw-r--r-- | src/client/linux/handler/exception_handler_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc index d05f3eb9..329d0147 100644 --- a/src/client/linux/handler/exception_handler_unittest.cc +++ b/src/client/linux/handler/exception_handler_unittest.cc @@ -258,6 +258,7 @@ TEST(ExceptionHandlerTest, ChildCrashWithFD) { ASSERT_NO_FATAL_FAILURE(ChildCrash(true)); } +#if !defined(__ANDROID_API__) || __ANDROID_API__ >= __ANDROID_API_N__ static void* SleepFunction(void* unused) { while (true) usleep(1000000); return NULL; @@ -270,7 +271,6 @@ static void* CrashFunction(void* b_ptr) { return NULL; } -#if !defined(__ANDROID_API__) || __ANDROID_API__ >= __ANDROID_API_N__ // Tests that concurrent crashes do not enter a loop by alternately triggering // the signal handler. TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { @@ -316,7 +316,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { // SIGKILL. ASSERT_NO_FATAL_FAILURE(WaitForProcessToTerminate(child, SIGSEGV)); } -#endif +#endif // !defined(__ANDROID_API__) || __ANDROID_API__ >= __ANDROID_API_N__ static bool DoneCallbackReturnFalse(const MinidumpDescriptor& descriptor, void* context, |