Upgrade expat to R_2_2_9

Manual changes to Android.bp and expat_config.h.

Test: treehugger
Change-Id: Iba9d1ed11fadaf15b95a9e94cbc128e77f3aea6d

1 files changed, 66 insertions, 69 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 1e245da0..d85e48c9 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -1,69 +1,66 @@
-include(CheckCCompilerFlag)

-include(CheckCSourceCompiles)

-include(CheckIncludeFile)

-include(CheckIncludeFiles)

-include(CheckSymbolExists)

-include(TestBigEndian)

-

-check_include_file("dlfcn.h" HAVE_DLFCN_H)

-check_include_file("fcntl.h" HAVE_FCNTL_H)

-check_include_file("inttypes.h" HAVE_INTTYPES_H)

-check_include_file("memory.h" HAVE_MEMORY_H)

-check_include_file("stdint.h" HAVE_STDINT_H)

-check_include_file("stdlib.h" HAVE_STDLIB_H)

-check_include_file("strings.h" HAVE_STRINGS_H)

-check_include_file("string.h" HAVE_STRING_H)

-check_include_file("sys/stat.h" HAVE_SYS_STAT_H)

-check_include_file("sys/types.h" HAVE_SYS_TYPES_H)

-check_include_file("unistd.h" HAVE_UNISTD_H)

-

-check_symbol_exists("getpagesize" "unistd.h" HAVE_GETPAGESIZE)

-check_symbol_exists("mmap" "sys/mman.h" HAVE_MMAP)

-check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM)

-

-if(USE_libbsd)

-    set(CMAKE_REQUIRED_LIBRARIES "${LIB_BSD}")

-    set(_bsd "bsd/")

-else()

-    set(_bsd "")

-endif()

-check_symbol_exists("arc4random_buf" "${_bsd}stdlib.h" HAVE_ARC4RANDOM_BUF)

-if(NOT HAVE_ARC4RANDOM_BUF)

-    check_symbol_exists("arc4random" "${_bsd}stdlib.h" HAVE_ARC4RANDOM)

-endif()

-set(CMAKE_REQUIRED_LIBRARIES)

-

-#/* Define to 1 if you have the ANSI C header files. */

-check_include_files("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)

-

-test_big_endian(WORDS_BIGENDIAN)

-#/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */

-if(WORDS_BIGENDIAN)

-    set(BYTEORDER 4321)

-else(WORDS_BIGENDIAN)

-    set(BYTEORDER 1234)

-endif(WORDS_BIGENDIAN)

-

-if(HAVE_SYS_TYPES_H)

-    check_symbol_exists("off_t" "sys/types.h" OFF_T)

-    check_symbol_exists("size_t" "sys/types.h" SIZE_T)

-else(HAVE_SYS_TYPES_H)

-    set(OFF_T "long")

-    set(SIZE_T "unsigned")

-endif(HAVE_SYS_TYPES_H)

-

-check_c_source_compiles("

-        #include <stdlib.h>  /* for NULL */

-        #include <unistd.h>  /* for syscall */

-        #include <sys/syscall.h>  /* for SYS_getrandom */

-        int main() {

-            syscall(SYS_getrandom, NULL, 0, 0);

-            return 0;

-        }"

-    HAVE_SYSCALL_GETRANDOM)

-

-configure_file(expat_config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/expat_config.h")

-add_definitions(-DHAVE_EXPAT_CONFIG_H)

-

-check_c_compiler_flag("-fno-strict-aliasing" FLAG_NO_STRICT_ALIASING)

-check_c_compiler_flag("-fvisibility=hidden" FLAG_VISIBILITY)

+include(CheckCCompilerFlag)
+include(CheckCSourceCompiles)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckSymbolExists)
+include(TestBigEndian)
+
+check_include_file("dlfcn.h" HAVE_DLFCN_H)
+check_include_file("fcntl.h" HAVE_FCNTL_H)
+check_include_file("inttypes.h" HAVE_INTTYPES_H)
+check_include_file("memory.h" HAVE_MEMORY_H)
+check_include_file("stdint.h" HAVE_STDINT_H)
+check_include_file("stdlib.h" HAVE_STDLIB_H)
+check_include_file("strings.h" HAVE_STRINGS_H)
+check_include_file("string.h" HAVE_STRING_H)
+check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
+check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
+check_include_file("unistd.h" HAVE_UNISTD_H)
+
+check_symbol_exists("getpagesize" "unistd.h" HAVE_GETPAGESIZE)
+check_symbol_exists("mmap" "sys/mman.h" HAVE_MMAP)
+check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM)
+
+if(EXPAT_WITH_LIBBSD)
+    set(CMAKE_REQUIRED_LIBRARIES "${LIB_BSD}")
+    set(_bsd "bsd/")
+else()
+    set(_bsd "")
+endif()
+check_symbol_exists("arc4random_buf" "${_bsd}stdlib.h" HAVE_ARC4RANDOM_BUF)
+if(NOT HAVE_ARC4RANDOM_BUF)
+    check_symbol_exists("arc4random" "${_bsd}stdlib.h" HAVE_ARC4RANDOM)
+endif()
+set(CMAKE_REQUIRED_LIBRARIES)
+
+#/* Define to 1 if you have the ANSI C header files. */
+check_include_files("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
+
+test_big_endian(WORDS_BIGENDIAN)
+#/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
+if(WORDS_BIGENDIAN)
+    set(BYTEORDER 4321)
+else(WORDS_BIGENDIAN)
+    set(BYTEORDER 1234)
+endif(WORDS_BIGENDIAN)
+
+if(HAVE_SYS_TYPES_H)
+    check_symbol_exists("off_t" "sys/types.h" OFF_T)
+    check_symbol_exists("size_t" "sys/types.h" SIZE_T)
+else(HAVE_SYS_TYPES_H)
+    set(OFF_T "long")
+    set(SIZE_T "unsigned")
+endif(HAVE_SYS_TYPES_H)
+
+check_c_source_compiles("
+        #include <stdlib.h>  /* for NULL */
+        #include <unistd.h>  /* for syscall */
+        #include <sys/syscall.h>  /* for SYS_getrandom */
+        int main() {
+            syscall(SYS_getrandom, NULL, 0, 0);
+            return 0;
+        }"
+    HAVE_SYSCALL_GETRANDOM)
+
+check_c_compiler_flag("-fno-strict-aliasing" FLAG_NO_STRICT_ALIASING)
+check_c_compiler_flag("-fvisibility=hidden" FLAG_VISIBILITY)