Merge "Replace local MUSL define with global ANDROID_HOST_MUSL"
diff --git a/Android.bp b/Android.bp
index 4590de7..1e440a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,9 +70,6 @@
darwin: {
cflags: ["-fno-common"],
},
- musl: {
- cflags: ["-DMUSL"],
- },
windows: {
enabled: true,
},
diff --git a/expat_config.h b/expat_config.h
index ad6dc644..4acf770 100644
--- a/expat_config.h
+++ b/expat_config.h
@@ -27,7 +27,7 @@
#define HAVE_GETPAGESIZE 1
/* Define to 1 if you have the `getrandom' function. */
-#if defined(__BIONIC__) || defined(MUSL)
+#if defined(__BIONIC__) || defined(ANDROID_HOST_MUSL)
#define HAVE_GETRANDOM 1
#endif
diff --git a/patches/config.diff b/patches/config.diff
index dfe93f9..d1c9207 100644
--- a/patches/config.diff
+++ b/patches/config.diff
@@ -23,7 +23,7 @@
#define HAVE_GETPAGESIZE 1
/* Define to 1 if you have the `getrandom' function. */
-+#if defined(__BIONIC__) || defined(MUSL)
++#if defined(__BIONIC__) || defined(ANDROID_HOST_MUSL)
#define HAVE_GETRANDOM 1
+#endif
