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/libgen_basename_test.cpp

diff --git a/tests/libgen_basename_test.cpp b/tests/libgen_basename_test.cpp
index fd3a81c..300282c 100644
--- a/tests/libgen_basename_test.cpp
+++ b/tests/libgen_basename_test.cpp
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+#include <sys/cdefs.h>
+
 #ifndef _GNU_SOURCE
   #define _GNU_SOURCE 1
 #endif
 
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
 #include <string.h>
 
 #if defined(basename)
@@ -33,7 +35,7 @@
 
 #include <libgen.h>
 
-#if !defined(basename) && !defined(MUSL)
+#if !defined(basename) && !defined(ANDROID_HOST_MUSL)
 #error basename should be defined at this point
 #endif
 
@@ -44,7 +46,7 @@
 #include <errno.h>
 #include <gtest/gtest.h>
 
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
 static void __TestGnuBasename(const char* in, const char* expected_out, int line) {
   errno = 0;
   const char* out = gnu_basename(in);
@@ -66,7 +68,7 @@
 #define TestPosixBasename(in, expected) __TestPosixBasename(in, expected, __LINE__)
 
 TEST(libgen_basename, gnu_basename) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   // GNU's basename doesn't accept NULL
   // TestGnuBasename(NULL, ".");
   TestGnuBasename("", "");