Merge SP1A.210425.001

Change-Id: If71c56f3e2e9fbbeffc7096a560a5ef8b8cd8566

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/semaphore_test.cpp b/tests/semaphore_test.cpp
index ed0fcf17e..f3f60208d 100644
--- a/tests/semaphore_test.cpp
+++ b/tests/semaphore_test.cpp
@@ -17,17 +17,18 @@
 #include <semaphore.h>
 
 #include <errno.h>
-#include <gtest/gtest.h>
 #include <limits.h>
 #include <pthread.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "BionicDeathTest.h"
+#include <android-base/silent_death_test.h>
+#include <gtest/gtest.h>
+
 #include "SignalUtils.h"
 #include "private/bionic_constants.h"
 
-using semaphore_DeathTest = BionicDeathTest;
+using semaphore_DeathTest = SilentDeathTest;
 
 TEST(semaphore, sem_init) {
   sem_t s;