summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-24Revert "Add signed integer overflow checking to zlib"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devidea133-weekly-releaseidea133Nick Kralevich
The build is broken. This reverts commit 4018ebf35d1ab1cd6b1340f44df0a1095cb5d10d.
2013-05-22Add signed integer overflow checking to zlibChad Brubaker
Migrate zlib over to Clang in order to use -ftrap to abort on signed overflow Change-Id: Ib2feb1dca89e18b4621b2fee0004b0f4d96d3dce
2013-05-10am 15b6223a: Merge "Upgrade to zlib 1.2.8."android-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8tools_r22.2kitkat-releasekitkat-cts-releaseElliott Hughes
* commit '15b6223aa57a347ce113729253802cb2fdeb4ad0': Upgrade to zlib 1.2.8.
2013-05-10Merge "Upgrade to zlib 1.2.8."jb-mr1.1-dev-plus-aospElliott Hughes
2013-05-09Upgrade to zlib 1.2.8.Elliott Hughes
From the upstream ChangeLog: Changes in 1.2.8 (28 Apr 2013) - Update contrib/minizip/iowin32.c for Windows RT [Vollant] - Do not force Z_CONST for C++ - Clean up contrib/vstudio [Ro§] - Correct spelling error in zlib.h - Fix mixed line endings in contrib/vstudio Changes in 1.2.7.3 (13 Apr 2013) - Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc Changes in 1.2.7.2 (13 Apr 2013) - Change check for a four-byte type back to hexadecimal - Fix typo in win32/Makefile.msc - Add casts in gzwrite.c for pointer differences Changes in 1.2.7.1 (24 Mar 2013) - Replace use of unsafe string functions with snprintf if available - Avoid including stddef.h on Windows for Z_SOLO compile [Niessink] - Fix gzgetc undefine when Z_PREFIX set [Turk] - Eliminate use of mktemp in Makefile (not always available) - Fix bug in 'F' mode for gzopen() - Add inflateGetDictionary() function - Correct comment in deflate.h - Use _snprintf for snprintf in Microsoft C - On Darwin, only use /usr/bin/libtool if libtool is not Apple - Delete "--version" file if created by "ar --version" [Richard G.] - Fix configure check for veracity of compiler error return codes - Fix CMake compilation of static lib for MSVC2010 x64 - Remove unused variable in infback9.c - Fix argument checks in gzlog_compress() and gzlog_write() - Clean up the usage of z_const and respect const usage within zlib - Clean up examples/gzlog.[ch] comparisons of different types - Avoid shift equal to bits in type (caused endless loop) - Fix unintialized value bug in gzputc() introduced by const patches - Fix memory allocation error in examples/zran.c [Nor] - Fix bug where gzopen(), gzclose() would write an empty file - Fix bug in gzclose() when gzwrite() runs out of memory - Check for input buffer malloc failure in examples/gzappend.c - Add note to contrib/blast to use binary mode in stdio - Fix comparisons of differently signed integers in contrib/blast - Check for invalid code length codes in contrib/puff - Fix serious but very rare decompression bug in inftrees.c - Update inflateBack() comments, since inflate() can be faster - Use underscored I/O function names for WINAPI_FAMILY - Add _tr_flush_bits to the external symbols prefixed by --zprefix - Add contrib/vstudio/vc10 pre-build step for static only - Quote --version-script argument in CMakeLists.txt - Don't specify --version-script on Apple platforms in CMakeLists.txt - Fix casting error in contrib/testzlib/testzlib.c - Fix types in contrib/minizip to match result of get_crc_table() - Simplify contrib/vstudio/vc10 with 'd' suffix - Add TOP support to win32/Makefile.msc - Suport i686 and amd64 assembler builds in CMakeLists.txt - Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h - Add vc11 and vc12 build files to contrib/vstudio - Add gzvprintf() as an undocumented function in zlib - Fix configure for Sun shell - Remove runtime check in configure for four-byte integer type - Add casts and consts to ease user conversion to C++ - Add man pages for minizip and miniunzip - In Makefile uninstall, don't rm if preceding cd fails - Do not return Z_BUF_ERROR if deflateParam() has nothing to write Change-Id: Ic05676d0ac8c877ba538ce60891d92472b73bf98
2012-08-14am 2d5094f0: Retire LOCAL_NDK_VERSION.android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devYing Wang
* commit '2d5094f0ebcb01fb9f11952d776945b090d89cf0': Retire LOCAL_NDK_VERSION.
2012-08-14Retire LOCAL_NDK_VERSION.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devYing Wang
Bug: 6932421 Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
2012-08-14Retire LOCAL_NDK_VERSION.Ying Wang
Bug: 6932421 Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
2012-07-31No-op - skip bad commitThe Android Open Source Project
Change-Id: I183623f0e16bc79e79efe4aece42acfb1d6cc07a
2012-07-30Initial empty repositoryChad Jones
2012-05-15Upgrade to zlib 1.2.7.Elliott Hughes
Also add a script that's the culmination of my recent fiddling around with the layout of this project: you can now run "update_zlib.sh" to upgrade to the latest zlib release. My work here is done. Change-Id: I76006233ec41ad1528023c8b1926964870785aa2
2012-05-10Separate the Android build stuff from the upstream zlib stuff.Elliott Hughes
Another step towards a script that does the zlib upgrades for us... Change-Id: I940b5b4e79d2a8daf7a47129bbea7bdaffd4140c
2012-05-10Remove cruft from our zlib-1.2.6 import.Elliott Hughes
There was a ton of cruft lying around from earlier versions. I want to move us to be as close to upstream as possible, so upgrades are simpler and quicker, and I can be more confident of what I'm doing. This is a first step. Change-Id: I526a64969ff2a5bf25067fae4530560acf095225
2012-05-04Fix zlib-host build.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-devElliott Hughes
Bug: 6369821 Change-Id: I8745b80986deb7dca7395d4f905f09865c3f358d
2012-05-03Revert "Revert "Make a libz.so for the host too.""Elliott Hughes
This reverts commit 84d8cc79372b5432628c0a4fdc59001984e076ae
2012-05-03Revert "Make a libz.so for the host too."Elliott Hughes
This reverts commit 13ee59ad1fec4e320540b5270251b77c6bf07c92
2012-05-03Make a libz.so for the host too.Elliott Hughes
(cherry picked from commit 7bd2783170024771e7406adb23c5955833f054b1) Change-Id: Ic3b0af7ea00989544e5b0c7fd73c493226e65584
2012-02-13am 30407b3f: Merge "[MIPS] Use NDK libs for ARM builds only"Jean-Baptiste Queru
* commit '30407b3fb9d461c2be733daffeadcb0d46b669b2': [MIPS] Use NDK libs for ARM builds only
2012-02-13Merge "[MIPS] Use NDK libs for ARM builds only"android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
2012-01-31[MIPS] Use NDK libs for ARM builds onlyChris Dearman
Signed-off-by: Chris Dearman <chris@mips.com>
2012-01-31Fix build (minizip.c moved).Elliott Hughes
Change-Id: I81a69d768797145e3c7d543a3ccfe143267e1720
2012-01-31Upgrade to zlib 1.2.6.Elliott Hughes
Change-Id: Id2bcb4a91755b39521c1151ebdcae557a4a783ce
2011-10-03Build zlib against NDK.android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseYing Wang
Change-Id: Ifc4c37d9580cbeb5c735bce811d0ceff58d93019
2010-09-16Add optional tags to zlib.android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadJesse Wilson
Change-Id: I764af48e29506c056ff083a9ae5b7534aea696f7
2010-08-04Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbreadBrian Carlstrom
2010-07-19am 8db57c99: am 080a35b0: add meta-files about 3rd party projectsThe Android Open Source Project
Merge commit '8db57c9937d7dd5a260c1b71201a0fe273534881' into dalvik-dev * commit '8db57c9937d7dd5a260c1b71201a0fe273534881': add meta-files about 3rd party projects
2010-07-19am 2ef2b5f9: Upgrade to zlib 1.2.5.Elliott Hughes
Merge commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f' into dalvik-dev * commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f': Upgrade to zlib 1.2.5.
2010-07-16am 080a35b0: add meta-files about 3rd party projectsThe Android Open Source Project
Merge commit '080a35b05be258bc0e541616be233b7ae5c9bb49' * commit '080a35b05be258bc0e541616be233b7ae5c9bb49': add meta-files about 3rd party projects
2010-07-16add meta-files about 3rd party projectsThe Android Open Source Project
Change-Id: Ic8165fa1af4d1c4424173b277a29de8bac3008b2
2010-04-22Upgrade to zlib 1.2.5.Elliott Hughes
Patch 1 is the upgrade from 1.2.3 to 1.2.4, patch 2 is the upgrade from 1.2.4 to 1.2.5. Change-Id: I3ad3661fa347c1c60a3139400eac5986e181d312
2010-04-20Upgrade to zlib 1.2.5.Elliott Hughes
Patch 1 is the upgrade from 1.2.3 to 1.2.4, patch 2 is the upgrade from 1.2.4 to 1.2.5. Change-Id: I8e78ba64c559b77f13d601f8612d9ea5f6e3c179
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7froyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: I8734e472adc2f1bcbc1e0b099511fb9662578b97
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-07-26reconcile korg/master into goog/masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru
2009-05-27am a64e4eaf: build zlib and minigzipDoug Zongker
Merge commit 'a64e4eaf41f9520f60051b758fb27f98e72d85ea' * commit 'a64e4eaf41f9520f60051b758fb27f98e72d85ea': build zlib and minigzip
2009-05-27build zlib and minigzipandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releasedonutDoug Zongker
Build zlib as a device static library (so we can use it in recovery) and as a host static library (so we can use it in OTA-building tools). Also build minigzip as a host executable, so we can use it in the build in place of gzip.
2009-04-22Merge donut into masterJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-17Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.5r4android-1.5r3android-1.5r2android-1.5cupcake-releaseThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-01-09Merge branch 'cupcake'The Android Open Source Project
2009-01-09auto import from //branches/cupcake/...@125939The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0cdma-importThe Android Open Source Project
1970-01-12external/zlib 1.2.3upstream/1.2.3Upstream
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 14:21:36 +0000