Upgrade expat to R_2_2_9

Manual changes to Android.bp and expat_config.h.

Test: treehugger
Change-Id: Iba9d1ed11fadaf15b95a9e94cbc128e77f3aea6d

1 files changed, 42 insertions, 42 deletions

diff --git a/CMake.README b/CMake.README
index fa6823a9..ce1d5088 100644
--- a/CMake.README
+++ b/CMake.README
@@ -1,42 +1,42 @@
-== How to build expat with cmake (experimental) ==

-

-The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual 

-Studio) and should work on all other platform cmake supports.

-

-Assuming ~/expat-2.2.7 is the source directory of expat, add a subdirectory

-build and change into that directory:

-~/expat-2.2.7$ mkdir build && cd build

-~/expat-2.2.7/build$

-

-From that directory, call cmake first, then call make, make test and 

-make install in the usual way:

-~/expat-2.2.7/build$ cmake ..

--- The C compiler identification is GNU

--- The CXX compiler identification is GNU

-....

--- Configuring done

--- Generating done

--- Build files have been written to: /home/patrick/expat-2.2.7/build

-

-If you want to specify the install location for your files, append 

--DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.

-

-~/expat-2.2.7/build$ make && make test && make install

-Scanning dependencies of target expat

-[  5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o

-[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o

-....

--- Installing: /usr/local/lib/pkgconfig/expat.pc

--- Installing: /usr/local/bin/xmlwf

--- Installing: /usr/local/share/man/man1/xmlwf.1

-

-For Windows builds, you must make sure to call cmake from an environment where 

-your compiler is reachable, that means either you call it from the 

-Visual Studio Command Prompt or when using mingw, you must open a cmd.exe and

-make sure that gcc can be called. On Windows, you also might want to specify a 

-special Generator for CMake:

-for Visual Studio builds do: 

-cmake .. -G "Visual Studio 10" && vcexpress expat.sln

-for mingw builds do: 

-cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:\expat-install 

-    && gmake && gmake install

+== How to build expat with cmake (experimental) ==
+
+The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
+Studio) and should work on all other platform cmake supports.
+
+Assuming ~/expat-2.2.9 is the source directory of expat, add a subdirectory
+build and change into that directory:
+~/expat-2.2.9$ mkdir build && cd build
+~/expat-2.2.9/build$
+
+From that directory, call cmake first, then call make, make test and
+make install in the usual way:
+~/expat-2.2.9/build$ cmake ..
+-- The C compiler identification is GNU
+-- The CXX compiler identification is GNU
+....
+-- Configuring done
+-- Generating done
+-- Build files have been written to: /home/patrick/expat-2.2.9/build
+
+If you want to specify the install location for your files, append
+-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
+
+~/expat-2.2.9/build$ make && make test && make install
+Scanning dependencies of target expat
+[  5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
+[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o
+....
+-- Installing: /usr/local/lib/pkgconfig/expat.pc
+-- Installing: /usr/local/bin/xmlwf
+-- Installing: /usr/local/share/man/man1/xmlwf.1
+
+For Windows builds, you must make sure to call cmake from an environment where
+your compiler is reachable, that means either you call it from the
+Visual Studio Command Prompt or when using mingw, you must open a cmd.exe and
+make sure that gcc can be called. On Windows, you also might want to specify a
+special Generator for CMake:
+for Visual Studio builds do:
+cmake .. -G "Visual Studio 15 2017" && msbuild /m expat.sln
+for mingw builds do:
+cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:\expat-install
+    && gmake && gmake install