diff options
| author | Colin Cross <ccross@android.com> | 2021-08-16 15:53:15 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2021-08-19 10:53:25 -0700 |
| commit | 2cd04903890c349a4c38e01f06ac7206bc97b2f6 (patch) | |
| tree | 169b36b1bd549ac660562f8db0f0fe4490d912c5 | |
| parent | efc6e91310075554373d0e2d1e1dfa9f9bfb688d (diff) | |
| download | expat-2cd04903890c349a4c38e01f06ac7206bc97b2f6.tar.gz | |
Replace local MUSL define with global ANDROID_HOST_MUSL
Bug: 190084016
Test: m USE_HOST_MUSL=true bionic-unit-tests-glibc
Change-Id: I56b23576cb24912112d2ae56d8ecc2e3716982fe
| -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 |