summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Build host with multilib both enabled."staging/cm-12.0-cafIan Rogers2014-06-051-0/+3
|\
| * Build host with multilib both enabled.Ian Rogers2014-06-051-0/+3
|/ | | | Change-Id: Ieb22dec4d3f810efeed93abe2238a75e451e2a06
* Revert "Add signed integer overflow checking to zlib"Nick Kralevich2013-05-241-16/+0
| | | | | | The build is broken. This reverts commit 4018ebf35d1ab1cd6b1340f44df0a1095cb5d10d.
* Add signed integer overflow checking to zlibChad Brubaker2013-05-221-0/+16
| | | | | | | Migrate zlib over to Clang in order to use -ftrap to abort on signed overflow Change-Id: Ib2feb1dca89e18b4621b2fee0004b0f4d96d3dce
* am 15b6223a: Merge "Upgrade to zlib 1.2.8."Elliott Hughes2013-05-1090-488/+3757
|\ | | | | | | | | * commit '15b6223aa57a347ce113729253802cb2fdeb4ad0': Upgrade to zlib 1.2.8.
| * Merge "Upgrade to zlib 1.2.8."Elliott Hughes2013-05-1090-488/+3757
| |\
| | * Upgrade to zlib 1.2.8.Elliott Hughes2013-05-0990-488/+3757
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 2d5094f0: Retire LOCAL_NDK_VERSION.Ying Wang2012-08-140-0/+0
|\| | | | | | | | | * commit '2d5094f0ebcb01fb9f11952d776945b090d89cf0': Retire LOCAL_NDK_VERSION.
| * Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-3/+0
| | | | | | | | | | Bug: 6932421 Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
* | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-3/+0
| | | | | | | | | | Bug: 6932421 Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
* | No-op - skip bad commitThe Android Open Source Project2012-07-310-0/+0
|\ \ | |/ |/| | | Change-Id: I183623f0e16bc79e79efe4aece42acfb1d6cc07a
| * Initial empty repositoryChad Jones2012-07-300-0/+0
|/
* Upgrade to zlib 1.2.7.Elliott Hughes2012-05-1556-573/+1062
| | | | | | | | 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
* Separate the Android build stuff from the upstream zlib stuff.Elliott Hughes2012-05-10234-2463/+2466
| | | | | | Another step towards a script that does the zlib upgrades for us... Change-Id: I940b5b4e79d2a8daf7a47129bbea7bdaffd4140c
* Remove cruft from our zlib-1.2.6 import.Elliott Hughes2012-05-1041-11934/+4
| | | | | | | | 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
* Fix zlib-host build.Elliott Hughes2012-05-041-1/+1
| | | | | | Bug: 6369821 Change-Id: I8745b80986deb7dca7395d4f905f09865c3f358d
* Revert "Revert "Make a libz.so for the host too.""Elliott Hughes2012-05-031-0/+10
| | | This reverts commit 84d8cc79372b5432628c0a4fdc59001984e076ae
* Revert "Make a libz.so for the host too."Elliott Hughes2012-05-031-10/+0
| | | This reverts commit 13ee59ad1fec4e320540b5270251b77c6bf07c92
* Make a libz.so for the host too.Elliott Hughes2012-05-031-0/+10
| | | | | | (cherry picked from commit 7bd2783170024771e7406adb23c5955833f054b1) Change-Id: Ic3b0af7ea00989544e5b0c7fd73c493226e65584
* am 30407b3f: Merge "[MIPS] Use NDK libs for ARM builds only"Jean-Baptiste Queru2012-02-131-3/+3
|\ | | | | | | | | * commit '30407b3fb9d461c2be733daffeadcb0d46b669b2': [MIPS] Use NDK libs for ARM builds only
| * Merge "[MIPS] Use NDK libs for ARM builds only"Jean-Baptiste Queru2012-02-131-3/+3
| |\
| | * [MIPS] Use NDK libs for ARM builds onlyChris Dearman2012-01-311-3/+3
| |/ | | | | | | Signed-off-by: Chris Dearman <chris@mips.com>
* | Fix build (minizip.c moved).Elliott Hughes2012-01-311-2/+2
| | | | | | | | Change-Id: I81a69d768797145e3c7d543a3ccfe143267e1720
* | Upgrade to zlib 1.2.6.Elliott Hughes2012-01-3189-4041/+4005
|/ | | | Change-Id: Id2bcb4a91755b39521c1151ebdcae557a4a783ce
* Build zlib against NDK.Ying Wang2011-10-031-1/+12
| | | | Change-Id: Ifc4c37d9580cbeb5c735bce811d0ceff58d93019
* Add optional tags to zlib.Jesse Wilson2010-09-161-0/+3
| | | | Change-Id: I764af48e29506c056ff083a9ae5b7534aea696f7
* Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbreadBrian Carlstrom2010-08-04174-3614/+26707
|\
| * am 8db57c99: am 080a35b0: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-191-0/+9
| |\ | | | | | | | | | | | | | | | | | | Merge commit '8db57c9937d7dd5a260c1b71201a0fe273534881' into dalvik-dev * commit '8db57c9937d7dd5a260c1b71201a0fe273534881': add meta-files about 3rd party projects
| | * am 080a35b0: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | |\ | |_|/ |/| | | | | | | | | | | | | | Merge commit '080a35b05be258bc0e541616be233b7ae5c9bb49' * commit '080a35b05be258bc0e541616be233b7ae5c9bb49': add meta-files about 3rd party projects
* | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | | | | | | | | | Change-Id: Ic8165fa1af4d1c4424173b277a29de8bac3008b2
| * | am 2ef2b5f9: Upgrade to zlib 1.2.5.Elliott Hughes2010-07-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f' into dalvik-dev * commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f': Upgrade to zlib 1.2.5.
| | * Upgrade to zlib 1.2.5.Elliott Hughes2010-04-20174-3614/+26707
| |/ |/| | | | | | | | | | | 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
| * Upgrade to zlib 1.2.5.Elliott Hughes2010-04-22174-3614/+26707
|/ | | | | | | 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
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I8734e472adc2f1bcbc1e0b099511fb9662578b97
* reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
|/|
| * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
| |
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-251-4/+31
| |\|
* | | am a64e4eaf: build zlib and minigzipDoug Zongker2009-05-271-4/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'a64e4eaf41f9520f60051b758fb27f98e72d85ea' * commit 'a64e4eaf41f9520f60051b758fb27f98e72d85ea': build zlib and minigzip
| * | build zlib and minigzipDoug Zongker2009-05-271-4/+31
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| |
* | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-170-0/+0
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03204-0/+54578
| |
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03204-54578/+0
| |
| * Merge branch 'cupcake'The Android Open Source Project2009-01-091-0/+10
| |\ | |/ |/|
* | auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-0/+10
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
|
* Initial ContributionThe Android Open Source Project2008-10-216-156/+71
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 11:06:01 +0000