summaryrefslogtreecommitdiffstats
Commit message (Expand)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
|/
* Revert "Add signed integer overflow checking to zlib"Nick Kralevich2013-05-241-16/+0
* Add signed integer overflow checking to zlibChad Brubaker2013-05-221-0/+16
* am 15b6223a: Merge "Upgrade to zlib 1.2.8."Elliott Hughes2013-05-1090-488/+3757
|\
| * 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
| |/
* | am 2d5094f0: Retire LOCAL_NDK_VERSION.Ying Wang2012-08-140-0/+0
|\|
| * Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-3/+0
* | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-3/+0
* | No-op - skip bad commitThe Android Open Source Project2012-07-310-0/+0
|\ \ | |/ |/|
| * Initial empty repositoryChad Jones2012-07-300-0/+0
|/
* Upgrade to zlib 1.2.7.Elliott Hughes2012-05-1556-573/+1062
* Separate the Android build stuff from the upstream zlib stuff.Elliott Hughes2012-05-10234-2463/+2466
* Remove cruft from our zlib-1.2.6 import.Elliott Hughes2012-05-1041-11934/+4
* Fix zlib-host build.Elliott Hughes2012-05-041-1/+1
* Revert "Revert "Make a libz.so for the host too.""Elliott Hughes2012-05-031-0/+10
* Revert "Make a libz.so for the host too."Elliott Hughes2012-05-031-10/+0
* Make a libz.so for the host too.Elliott Hughes2012-05-031-0/+10
* am 30407b3f: Merge "[MIPS] Use NDK libs for ARM builds only"Jean-Baptiste Queru2012-02-131-3/+3
|\
| * 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
| |/
* | Fix build (minizip.c moved).Elliott Hughes2012-01-311-2/+2
* | Upgrade to zlib 1.2.6.Elliott Hughes2012-01-3189-4041/+4005
|/
* Build zlib against NDK.Ying Wang2011-10-031-1/+12
* Add optional tags to zlib.Jesse Wilson2010-09-161-0/+3
* 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
| |\
| | * am 080a35b0: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | |\ | |_|/ |/| |
* | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| * | am 2ef2b5f9: Upgrade to zlib 1.2.5.Elliott Hughes2010-07-190-0/+0
| |\|
| | * Upgrade to zlib 1.2.5.Elliott Hughes2010-04-20174-3614/+26707
| |/ |/|
| * Upgrade to zlib 1.2.5.Elliott Hughes2010-04-22174-3614/+26707
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* 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
|\ \ \ | | |/ | |/|
| * | build zlib and minigzipDoug Zongker2009-05-271-4/+31
* | | 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