diff options
| author | Colin Cross <ccross@android.com> | 2021-07-28 19:47:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-28 19:47:58 +0000 |
| commit | a9e0aeff340ff66322707620d470fdaea25630dc (patch) | |
| tree | ed2852fe419ff3610157db7cd98b5f21141b3acb | |
| parent | 15be57516e7b4e1751804b4e2d23f71fc781767a (diff) | |
| parent | d6bc194f4598e769e2dda1f4a85691217702f94d (diff) | |
| download | expat-a9e0aeff340ff66322707620d470fdaea25630dc.tar.gz | |
Merge "Add support for building libexpat against musl" am: 667f64dc71 am: d6bc194f45
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1776888
Change-Id: I20091b9233ac2885860d8cefc996a437a79b3952
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | expat_config.h | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -70,7 +70,9 @@ cc_library { darwin: { cflags: ["-fno-common"], }, - + musl: { + cflags: ["-DMUSL"], + }, windows: { enabled: true, }, diff --git a/expat_config.h b/expat_config.h index 7253eb57..69b01c83 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__) +#if defined(__BIONIC__) || defined(MUSL) #define HAVE_GETRANDOM 1 #endif @@ -56,7 +56,7 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have `syscall' and `SYS_getrandom'. */ -#if defined(__BIONIC__) +#if defined(__BIONIC__) || defined(MUSL) #define HAVE_SYSCALL_GETRANDOM 1 #endif |