summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877 am: ↵Paul Duffin
3b539e5853 am: 851ab139ae am: 2fdae36fc6 am: cdf19cb4b7 am: 161a47bda3 * commit '161a47bda3f45c4df0a1c09fc0220107a4752cbd': Upgrade to expat 2.1.1 Change-Id: Id8a4baa18df568a801ed7fe79ea2afa779b4dcd8
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877 am: ↵Paul Duffin
3b539e5853 am: 851ab139ae am: 2fdae36fc6 am: cdf19cb4b7 * commit 'cdf19cb4b736077f3ba303671aac1136bacf95e1': Upgrade to expat 2.1.1 Change-Id: I3087080d6842c8136936ae9f4c1419c85607ef43
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed InputPaul Duffin
Includes all changes made on the cve-2016-0718-fix-2-2-1 branch that was merged into the master branch in commit be4b1c06daba1849b8ff5e00bae5caf47f6c39fd in repository http://git.code.sf.net/p/expat/code_git (cherry picked from commit 7b64b72da916c9c9c285939c11f81de938268fa9) Bug: 28698301 Change-Id: I9fe93040b3a9afb04be63c5fd453a2b99c01fb37
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877 am: ↵Paul Duffin
3b539e5853 am: 851ab139ae am: 2fdae36fc6 * commit '2fdae36fc6b22b4c4a1c8fbfaff73a368ef9a4b1': Upgrade to expat 2.1.1 Change-Id: I7b13c2d0f25afc5c099a11c0f6c4871aae49e3ab
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877 am: ↵Paul Duffin
3b539e5853 am: 851ab139ae * commit '851ab139ae19bdd470fdc3a4b06b333dfa878367': Upgrade to expat 2.1.1 Change-Id: I58685869d1ac52fac607a43779a6db56987926e6
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694 am: f660c7f877Paul Duffin
am: 3b539e5853 * commit '3b539e585367507a039ae86f91747dc05b659139': Upgrade to expat 2.1.1 Change-Id: I64ae175b4e0cf45540992005635a679d279fd0d8
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5 am: 095459e694Paul Duffin
am: f660c7f877 * commit 'f660c7f877e74a14f9a4c24065566d8680dbb274': Upgrade to expat 2.1.1 Change-Id: I34072d453dc1d9740c9d57d51641ab9647ec4a8e
2016-05-24Merge "Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: ↵Paul Duffin
7b64b72da9 am: 702a044c0e" into nyc-mr1-dev-plus-aosp am: 2fc66587d9 * commit '2fc66587d9f28b5eda7eef581206acb20585d2d5': Change-Id: I68b5ab59347bdbe357fac17d76d5642de05ae37c
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: ↵Paul Duffin
7b64b72da9 am: 3a4a3cbf87 am: a39c8ca7b7 * commit 'a39c8ca7b773a9c9bc78238387a73d4665b14c4d': Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input Change-Id: I899fe75fbf3a64ca342258cc3c882cfaa902845a
2016-05-24Upgrade to expat 2.1.1 am: c05e032be5Paul Duffin
am: 095459e694 * commit '095459e694e64193182e06492cd9cae8c19bb305': Upgrade to expat 2.1.1 Change-Id: I143540f97ef3d7119dac59f598ddb41eceb53585
2016-05-24Merge "Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: ↵Android Build Merger (Role)
7b64b72da9 am: 702a044c0e" into nyc-mr1-dev-plus-aosp
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: 7b64b72da9Paul Duffin
am: 3a4a3cbf87 * commit '3a4a3cbf875a97e976214d869a730d30a8d2750f': Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input Change-Id: I7d8fb11de478d2f76d785a9a519304f661a1b37a
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: 7b64b72da9Paul Duffin
am: 702a044c0e * commit '702a044c0ea7e1ef840c258029e7b751070eca52': Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input Change-Id: I0b57bac1849f6e6a7fcced0b4ac56e64d50ddcda
2016-05-24Upgrade to expat 2.1.1Paul Duffin
am: c05e032be5 * commit 'c05e032be5350e70e721727a96d5d4309f74af01': Upgrade to expat 2.1.1 Change-Id: Id9716e0e4fa0f95eb816cba19a1831b566f91d7c
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed InputPaul Duffin
am: 7b64b72da9 * commit '7b64b72da916c9c9c285939c11f81de938268fa9': Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input Change-Id: Ideff99ab37d1a84072ec2ca6018d67341fc5135e
2016-05-24Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed InputPaul Duffin
am: 7b64b72da9 * commit '7b64b72da916c9c9c285939c11f81de938268fa9': Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input Change-Id: I3eeba2cb0a0321f80eb47b12dccf42c71b0e7b9e
2016-05-19Upgrade to expat 2.1.1Paul Duffin
Modified the import_expat.sh script as the archive is now compressed using bzip2 instead of gzip and uses configure.ac instead of configure.in. Modified README.android to make the example command up to date with respect to the new archive format and also to ensure that it builds dependencies. All the remaining changes are straight from upstream. Bug: 27818751 (cherry picked from commit cee23496d017f13eccc125e2ab7044de53dec8da) Change-Id: Ic75a6c455dbcc34aaa7c30c109dc1565c5c52b04
2016-05-19Merge "Upgrade to expat 2.1.1 am: cfc0bc5960 am: 9dec3ced6a" into ↵Paul Duffin
nyc-mr1-dev-plus-aosp am: fad7041346 * commit 'fad70413460204bdee7e7cd1cde9f5202d3e010c': Change-Id: I720fb8e336df1c9bc8f1628735ec87282faa210b
2016-05-19Upgrade to expat 2.1.1 am: cfc0bc5960 am: 75335867abPaul Duffin
am: 6d4cf1753d * commit '6d4cf1753dcd7673ff2f680f76fe6750af8fa55c': Upgrade to expat 2.1.1 Change-Id: I63273715f826fc6f7944b5694981c6024346b9f0
2016-05-19Merge "Upgrade to expat 2.1.1 am: cfc0bc5960 am: 9dec3ced6a" into ↵Android Build Merger (Role)
nyc-mr1-dev-plus-aosp
2016-05-19Upgrade to expat 2.1.1 am: cfc0bc5960Paul Duffin
am: 75335867ab * commit '75335867ab3b7128f3a53d16d35e0662e5640c97': Upgrade to expat 2.1.1 Change-Id: I9622afd22bf59ecd6652544fca5f2af484ffa254
2016-05-19Upgrade to expat 2.1.1 am: cfc0bc5960Paul Duffin
am: 9dec3ced6a * commit '9dec3ced6a6130d875ce615a518cb1896697b5aa': Upgrade to expat 2.1.1 Change-Id: Ie1e3ce15cfc563f5bf1639cd4a3e44a63a4ec498
2016-05-19Upgrade to expat 2.1.1Paul Duffin
am: cfc0bc5960 * commit 'cfc0bc59601e6289e9f1b836f11f5ab2cab60c81': Upgrade to expat 2.1.1 Change-Id: I9c887e4b06239b5a65e1ab15f8bd89b273adec08
2016-05-19Upgrade to expat 2.1.1Paul Duffin
am: cfc0bc5960 * commit 'cfc0bc59601e6289e9f1b836f11f5ab2cab60c81': Upgrade to expat 2.1.1 Change-Id: I9fb5f9cb007b5c8dd165fca49b0e79218d8958f3
2016-05-18Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed InputPaul Duffin
Includes all changes made on the cve-2016-0718-fix-2-2-1 branch that was merged into the master branch in commit be4b1c06daba1849b8ff5e00bae5caf47f6c39fd in repository http://git.code.sf.net/p/expat/code_git Bug: 28698301 Change-Id: I8263b84d6d3d203ee7e96aa7b1567455323ee6b2
2016-05-13Upgrade to expat 2.1.1Paul Duffin
Modified the import_expat.sh script as the archive is now compressed using bzip2 instead of gzip and uses configure.ac instead of configure.in. Modified README.android to make the example command up to date with respect to the new archive format and also to ensure that it builds dependencies. All the remaining changes are straight from upstream. Bug: 27818751 (cherry picked from commit cee23496d017f13eccc125e2ab7044de53dec8da) Change-Id: Ic75a6c455dbcc34aaa7c30c109dc1565c5c52b04
2016-05-04Merge "Upgrade to expat 2.1.1" am: b9805a57ce am: 1f9fd40a04 am: bec62e2192Paul Duffin
am: 6b58725c05 * commit '6b58725c0539edb399508911b760ac0a5ef15551': Upgrade to expat 2.1.1 Change-Id: I4e4276813806279d1fa9babc9c2ac4468627a4cf
2016-05-04Merge "Upgrade to expat 2.1.1" am: b9805a57ce am: 1f9fd40a04Paul Duffin
am: bec62e2192 * commit 'bec62e21921acba5d295685f96d78bc5d7356637': Upgrade to expat 2.1.1 Change-Id: I4b70ee4d15729451bca7a0d93bb914c154ba29f8
2016-05-04Merge "Upgrade to expat 2.1.1" am: b9805a57cePaul Duffin
am: 1f9fd40a04 * commit '1f9fd40a04fe5ca5ca73f27bf47c6c5a5d78adb7': Upgrade to expat 2.1.1 Change-Id: I7f4e8052e09a41097cb29bc692701e566acac98e
2016-05-04Merge "Upgrade to expat 2.1.1"Paul Duffin
am: b9805a57ce * commit 'b9805a57ce1ef5cd9c1668316a2c71e0aaa50291': Upgrade to expat 2.1.1 Change-Id: Ifb110ddb8c367d41d37a1990d8753b1dfd191893
2016-05-04Merge "Upgrade to expat 2.1.1"Paul Duffin
2016-05-04Upgrade to expat 2.1.1Paul Duffin
Modified the import_expat.sh script as the archive is now compressed using bzip2 instead of gzip and uses configure.ac instead of configure.in. Modified README.android to make the example command up to date with respect to the new archive format and also to ensure that it builds dependencies. All the remaining changes are straight from upstream. Bug: 27818751 Change-Id: Ia4d587e98a3f68b7133cdbcb0ca952e18fffcfe8
2015-11-19Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk. am: 31f5915e34 -s oursDaniel Erat
am: 718f25197a * commit '718f25197aa07d995faedae79823b8778428c59c': Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.
2015-11-19Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.Daniel Erat
am: 31f5915e34 -s ours * commit '31f5915e3467f8a5afc6273d90793e7211063cb8': Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.
2015-11-16Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.Daniel Erat
Export the lib/ directory to increase compatibility with third-party code that includes <expat.h>. (Android.mk currently copies expat.h and expat_external.h to /usr/include/libexpat, but this location is non-standard.) Bug: 22328216 (cherry picked from commit e665ddbe2535c55032569b0c41e9d728bef1f65b) Change-Id: I734b2ee3ad3402b43ec44d6dd0f38aca5041ea21
2015-09-01am 8f29c932: am a471c1b8: am 47d70030: Merge "Whitelist windows modules"Dan Willemsen
* commit '8f29c9326421b210a6a5ae5b7a887f7553f541e5': Whitelist windows modules
2015-09-01am a471c1b8: am 47d70030: Merge "Whitelist windows modules"Dan Willemsen
* commit 'a471c1b8a417c6c393918315beba1595e43a04a7': Whitelist windows modules
2015-09-01am 47d70030: Merge "Whitelist windows modules"Dan Willemsen
* commit '47d70030a603d359a89e06392415876f71756c0e': Whitelist windows modules
2015-08-31Merge "Whitelist windows modules"Dan Willemsen
2015-08-28Whitelist windows modulesDan Willemsen
And start using LOCAL_..._darwin instead of checking HOST_OS. Bug: 23566667 Change-Id: I7381867f54c3fd20c07100aefb3d9d803da554fe
2015-08-27am a51bfe90: am 80aa6483: (-s ours) am 15c7ae34: Merge "Stop using ↵Elliott Hughes
LOCAL_COPY_HEADERS in expat." * commit 'a51bfe906e899b3692af1717cc87deffed245f92':
2015-08-27am 83412ef5: am 8428506d: (-s ours) am 803b7291: Merge "Set ↵Daniel Erat
LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk." * commit '83412ef5d31ee2f5d8e250ff5291f2e0d9a3d1be':
2015-08-27am 80aa6483: (-s ours) am 15c7ae34: Merge "Stop using LOCAL_COPY_HEADERS in ↵Elliott Hughes
expat." * commit '80aa64833c352aebdc2c9d533289e072d263cf04':
2015-08-27am 8428506d: (-s ours) am 803b7291: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS ↵Daniel Erat
in Android.mk." * commit '8428506d14303f9f523c64b5b52a4307f8c75fb7':
2015-07-30Merge "package version metadata for external/"Bill Napier
2015-07-23am 15c7ae34: Merge "Stop using LOCAL_COPY_HEADERS in expat."Elliott Hughes
* commit '15c7ae3416c46c9f753df12e194511db76afea41': Stop using LOCAL_COPY_HEADERS in expat.
2015-07-23am 15c7ae34: Merge "Stop using LOCAL_COPY_HEADERS in expat."Elliott Hughes
* commit '15c7ae3416c46c9f753df12e194511db76afea41': Stop using LOCAL_COPY_HEADERS in expat.
2015-07-22Merge "Stop using LOCAL_COPY_HEADERS in expat."Elliott Hughes
2015-07-22Stop using LOCAL_COPY_HEADERS in expat.Elliott Hughes
I've cleaned up all the references to libexpat/ in the tree. Change-Id: Ibd37cf17d5c3b63cb5006d4700e0a10acbf39560
2015-07-09am 803b7291: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk."Daniel Erat
* commit '803b729174c246c2a55c6fe59570762b02cc5d11': Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 02:54:32 +0000