diff options
| author | Colin Cross <ccross@android.com> | 2021-08-23 20:01:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-23 20:01:07 +0000 |
| commit | ccbd1b79e23b3d22978c550fc910673d4cee42fa (patch) | |
| tree | 169b36b1bd549ac660562f8db0f0fe4490d912c5 | |
| parent | e7fbf080fe906911e29f42756740dde86f272497 (diff) | |
| parent | 27258d2aab7d2e5aafe5744d0b0e64fffd64b727 (diff) | |
| download | expat-ccbd1b79e23b3d22978c550fc910673d4cee42fa.tar.gz | |
Merge "Replace local MUSL define with global ANDROID_HOST_MUSL" am: 4828721be3 am: d7b6dc31ac am: c85f890709 am: 27258d2aab
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1797428
Change-Id: I8d989e015756da04b2948ca9c8a01735857e5ed7
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | expat_config.h | 2 | ||||
| -rw-r--r-- | patches/config.diff | 2 |
3 files changed, 2 insertions, 5 deletions
@@ -70,9 +70,6 @@ cc_library { darwin: { cflags: ["-fno-common"], }, - musl: { - cflags: ["-DMUSL"], - }, windows: { enabled: true, }, diff --git a/expat_config.h b/expat_config.h index ad6dc644..4acf7709 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 dfe93f94..d1c92074 100644 --- a/patches/config.diff +++ b/patches/config.diff @@ -23,7 +23,7 @@ Index: expat/expat_config.h #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 |