commit 27258d2aab7d2e5aafe5744d0b0e64fffd64b727
author Colin Cross <ccross@android.com> Mon Aug 23 19:46:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 23 19:46:27 2021 +0000
tree 169b36b1bd549ac660562f8db0f0fe4490d912c5
parent d07b647a776a9aaf6f5659e4750b3c56b9bec4de
parent c85f89070979cb7dee705215bdf8cc0a350e783c

Merge "Replace local MUSL define with global ANDROID_HOST_MUSL" am: 4828721be3 am: d7b6dc31ac am: c85f890709

Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1797428

Change-Id: Ib44145a37b176579213df55c9baae3120e704a07

Android.bp

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,
         },

expat_config.h

diff --git a/expat_config.h b/expat_config.h
index ad6dc64..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
 

patches/config.diff

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