diff options
| author | Haibo Huang <hhb@google.com> | 2019-10-11 11:13:39 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2019-11-13 10:28:10 -0800 |
| commit | 40a7191d8057597978b149621d2882ca507d8cb5 (patch) | |
| tree | e8d918e4285a965f916def290385a0614313bde1 /patches | |
| parent | 4c60b0d92a62545fa2ff75f7cac070df04a59bdf (diff) | |
| download | expat-40a7191d8057597978b149621d2882ca507d8cb5.tar.gz | |
Upgrade expat to R_2_2_9
Manual changes to Android.bp and expat_config.h.
Test: treehugger
Change-Id: Iba9d1ed11fadaf15b95a9e94cbc128e77f3aea6d
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/config.diff | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/patches/config.diff b/patches/config.diff index 58f29fef..340889a5 100644 --- a/patches/config.diff +++ b/patches/config.diff @@ -2,7 +2,7 @@ Index: expat/expat_config.h =================================================================== --- expat.orig/expat_config.h +++ expat/expat_config.h -@@ -5,10 +5,14 @@ +@@ -8,10 +8,14 @@ #define BYTEORDER 1234 /* Define to 1 if you have the `arc4random' function. */ @@ -17,8 +17,8 @@ Index: expat/expat_config.h +#define HAVE_ARC4RANDOM_BUF 1 +#endif - /* Define to 1 if you have the `bcopy' function. */ - #define HAVE_BCOPY 1 + /* Define to 1 if you have the <dlfcn.h> header file. */ + #define HAVE_DLFCN_H 1 @@ -23,7 +27,9 @@ #define HAVE_GETPAGESIZE 1 @@ -29,18 +29,7 @@ Index: expat/expat_config.h /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 -@@ -53,7 +59,9 @@ - #define HAVE_STRING_H 1 - - /* Define to 1 if you have `syscall' and `SYS_getrandom'. */ --/* #undef HAVE_SYSCALL_GETRANDOM */ -+#if defined(__BIONIC__) -+#define HAVE_SYSCALL_GETRANDOM 1 -+#endif - - /* Define to 1 if you have the <sys/param.h> header file. */ - #define HAVE_SYS_PARAM_H 1 -@@ -105,7 +113,9 @@ +@@ -115,7 +121,9 @@ #define XML_CONTEXT_BYTES 1024 /* Define to include code reading entropy from `/dev/urandom'. */ |