commit 4c5595c968a1cf2211edfb2817009af6d5bc0522
author Colin Cross <ccross@android.com> Mon Aug 16 15:51:59 2021 -0700
committer Colin Cross <ccross@android.com> Mon Aug 16 16:44:24 2021 -0700
tree 1bf81f53721d1fab5f1bd0cbe6c2e1d5c6274616
parent 14d15076199992f71997a1147f41bdfc2fd192ef

Replace local MUSL define with global ANDROID_HOST_MUSL

Bug: 190084016
Test: m USE_HOST_MUSL=true bionic-unit-tests-glibc
Change-Id: I56b23576cb24912112d2ae56d8ecc2e3716982fe

tests/pthread_test.cpp

diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 3686ffb..e4f9cb8 100644
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -23,6 +23,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
+#include <sys/cdefs.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
 #include <sys/resource.h>
@@ -844,7 +845,7 @@
     ASSERT_EQ(pshared_value_array[i], pshared);
   }
 
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   // musl doesn't have pthread_rwlockattr_setkind_np
   int kind_array[] = {PTHREAD_RWLOCK_PREFER_READER_NP,
                       PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP};
@@ -1238,7 +1239,7 @@
 #endif  // __BIONIC__
 }
 
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
 // musl doesn't have pthread_rwlockattr_setkind_np
 class RwlockKindTestHelper {
  private:
@@ -1310,7 +1311,7 @@
 #endif
 
 TEST(pthread, pthread_rwlock_kind_PTHREAD_RWLOCK_PREFER_READER_NP) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   RwlockKindTestHelper helper(PTHREAD_RWLOCK_PREFER_READER_NP);
   ASSERT_EQ(0, pthread_rwlock_rdlock(&helper.lock));
 
@@ -1332,7 +1333,7 @@
 }
 
 TEST(pthread, pthread_rwlock_kind_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   RwlockKindTestHelper helper(PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
   ASSERT_EQ(0, pthread_rwlock_rdlock(&helper.lock));
 
@@ -2166,7 +2167,7 @@
   ASSERT_EQ(0, memcmp(&lock_normal, &m1.lock, sizeof(pthread_mutex_t)));
   pthread_mutex_destroy(&lock_normal);
 
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   // musl doesn't support PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP or
   // PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.
   pthread_mutex_t lock_errorcheck = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;