summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* zlib: Inherit sys/stat.h from libcstaging/cm-14.1-cafrebasecm-14.1cm-14.0Rashed Abdel-Tawab2016-08-251-0/+2
| | | | | | Needed for the mkdir function Change-Id: Id6111b8aecb21dd3bfc61b1d3aad6927d4120c63
* zlib: Remove usage of cpu directive in inline asmSteve Kondik2016-08-242-1/+2
| | | | | | | | | * Clang will actually handle this fine by default, but GCC will not. On the other hand, Clang doesn't support the .cpu directive. Instead, set it as a CFLAG for arm64 only, which makes everyone happy. Change-Id: Ice5b62d43e81f13bd7d3e7a0b7afe4a547b2e758
* zlib: crc optimization for arm64Keith Mok2016-08-241-0/+73
| | | | | | | | | | | | | | | | Use arm64 crc32 instruction set if available Doing 100M data crc 100 times: Without using arm64 crc instruction set takes: 14.85s With arm64 crc instruction set takes: 2.08s Performance measured on snapdragon 810, with cpu frequency set to max and cpu governor change to userspace. Change-Id: I3ee5be087d04573c004fc6f4b22988cdda1b81e7
* minizip: Clean up the codeSteve Kondik2016-08-244-46/+37
| | | | | | * Fix symbol visibility and unused code Change-Id: I8c299ca78b8be61ce6114d3bb621464fbd0171d4
* zlib: Fix build under MTom Marshall2016-08-243-4/+4
| | | | | | See bionic change Ic3cb409aae6713f4b345de954bcc4241fcd969ec Change-Id: Ifb513b2c8e78c0f7035da39b475672d0d8cd37d4
* Merge "Avoid shifts of negative values inflateMark()."Elliott Hughes2016-01-191-2/+3
|\
| * Avoid shifts of negative values inflateMark().Mark Adler2016-01-151-2/+3
|/ | | | | | | | | | | The C standard says that bit shifts of negative integers is undefined. This casts to unsigned values to assure a known result. (cherry picked from upstream github madler/zlib commit e54e1299404101a5a9d0cf5e45512b543967f958) Bug: http://b/26133956 Change-Id: I1c641ca7d5802b2bdd7d1c266c3cc201bc5ae68a
* Merge "Remove LOCAL_NDK_STL_VARIANT"Colin Cross2015-12-011-2/+0
|\
| * Remove LOCAL_NDK_STL_VARIANTColin Cross2015-11-301-2/+0
| | | | | | | | | | | | | | | | LOCAL_NDK_STL_VARIANT := none is apparently not supported, go back to using STL for the device NDK build case. Bug: 25904002 Change-Id: I8e8b32c7274925168c321f60fe69b225dcfc0aa5
* | Merge "Fix typo"Colin Cross2015-11-301-2/+2
|\|
| * Fix typoColin Cross2015-11-301-2/+2
| | | | | | | | | | | | | | LOCAL_NDK_STL_VARIANT, not LOCAL_NDL_STL_VARIANT. Bug: 25904002 Change-Id: I295fb514b2ec041f3041d8bca5dc2920de4feb95
* | Merge "Use LOCAL_NDK_STL_VARIANT instead of LOCAL_CXX_STL"Colin Cross2015-11-301-2/+6
|\|
| * Use LOCAL_NDK_STL_VARIANT instead of LOCAL_CXX_STLColin Cross2015-11-301-2/+6
|/ | | | | | | | | When TARGET_BUILD_APPS is set the libz modules switch to building against the NDK, which requires LOCAL_NDK_STL_VARIANT instead of LOCAL_CXX_STL. Bug: 25904002 Change-Id: I05339365d81f2359bcaa415e485490e7a6de09c6
* Merge "Remove STL dependency"Colin Cross2015-11-301-0/+8
|\
| * Remove STL dependencyColin Cross2015-11-301-0/+8
|/ | | | | | | | | zlib doesn't use STL, remove the dependency using LOCAL_CXX_STL := none to allow modules that depend on zlib to select a non-default STL without conflicting with the default STL linked into zlib. Bug: 25904002 Change-Id: I532cecb7c7c47fbbb3c91673791bfdc48ffff355
* am e54ac962: am d377c485: Merge "Fix bug number for linker related workarounds"Dimitry Ivanov2015-09-281-1/+1
|\ | | | | | | | | * commit 'e54ac9621635d62b60d40e670d255ef1c4302c42': Fix bug number for linker related workarounds
| * am d377c485: Merge "Fix bug number for linker related workarounds"Dimitry Ivanov2015-09-281-1/+1
| |\ | | | | | | | | | | | | * commit 'd377c48594b4ef2176dfe850b5011f5f826693ca': Fix bug number for linker related workarounds
| | * Merge "Fix bug number for linker related workarounds"Dimitry Ivanov2015-09-281-1/+1
| | |\
| | | * Fix bug number for linker related workaroundsDmitriy Ivanov2015-09-281-1/+1
| | |/ | | | | | | | | | | | | Bug: http:/b/24425865 Change-Id: I646378190ef2fe023d32ecdc154014b4c58b8bb6
* | | am 84363e91: am 316ed876: Merge "Whitelist windows modules"Dan Willemsen2015-09-011-2/+1
|\| | | | | | | | | | | | | | * commit '84363e91550985b80116a906c49fa150743c58b1': Whitelist windows modules
| * | am 316ed876: Merge "Whitelist windows modules"Dan Willemsen2015-09-011-2/+1
| |\| | | | | | | | | | | | | * commit '316ed876bc5be0f5c67493ae37afc140fe07c0f2': Whitelist windows modules
| | * Merge "Whitelist windows modules"Dan Willemsen2015-08-311-2/+1
| | |\
| | | * Whitelist windows modulesDan Willemsen2015-08-281-2/+1
| | |/ | | | | | | | | | | | | Bug: 23566667 Change-Id: Iee4a18aca8bd68e0527ea6dd977c43e3d4ed239c
* | | am d7eb96c5: (-s ours) am 73f34086: Merge "Always use the NDK for unbundled ↵Dan Albert2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | branches." * commit 'd7eb96c5b47d693c40c8c744f77f9c45ac3188b8':
| * | am 73f34086: Merge "Always use the NDK for unbundled branches."Dan Albert2015-08-141-4/+0
| |\| | | | | | | | | | | | | * commit '73f340863693dd5394082251f4fba8ce4f70c2d0': Always use the NDK for unbundled branches.
* | | am 4423567b: Always use the NDK for unbundled branches.Dan Albert2015-08-140-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit '4423567b8e66b497731db479a02a606616ee0b1e': Always use the NDK for unbundled branches.
| * | | Always use the NDK for unbundled branches.Dan Albert2015-08-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/23221721 Change-Id: I40c0c17d219580866733eedb2352681455bf7511 (cherry picked from commit ead94aece8cf617c9b07b52d6d24e5a805ec5f48)
* | | | am 73f34086: Merge "Always use the NDK for unbundled branches."Dan Albert2015-08-141-4/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * commit '73f340863693dd5394082251f4fba8ce4f70c2d0': Always use the NDK for unbundled branches.
| * | Merge "Always use the NDK for unbundled branches."Dan Albert2015-08-141-4/+0
| |\ \
| | * | Always use the NDK for unbundled branches.Dan Albert2015-08-141-4/+0
| |/ / | | | | | | | | | | | | Bug: http://b/23221721 Change-Id: I40c0c17d219580866733eedb2352681455bf7511
* | / Merge branch 'mnc-dev-plus-aosp' of ↵Dmitriy Ivanov2015-05-080-0/+0
|\| | | |/ |/| | | https://googleplex-android.googlesource.com/_direct/platform/external/zlib into mnc-dev-plus-aosp
| * Merge "Switch libz.so to hash-style=both"Dmitriy Ivanov2015-05-081-1/+1
| |\
| | * Switch libz.so to hash-style=bothDmitriy Ivanov2015-05-081-1/+1
| |/ | | | | | | | | Bug: http://b/19059885 Change-Id: Ia0ae87217720fb1c6b334af3548545b143054c89
* / Switch libz.so to hash-style=bothDmitriy Ivanov2015-05-081-1/+1
|/ | | | | | Bug: http://b/19059885 Change-Id: Ia0ae87217720fb1c6b334af3548545b143054c89 (cherry picked from commit 9630d2db3b117d88e08c33a8c32ff7b7a8bab2f0)
* Merge "Switch libz to sysv-only hash style"Dmitriy Ivanov2015-03-131-1/+1
|\
| * Switch libz to sysv-only hash styleDmitriy Ivanov2015-03-131-1/+1
|/ | | | | Bug: 19059885 Change-Id: I339b873d6b8f2bc847bf225bcf50d57e543f8647
* Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
|\
| * Generate gnu hash for arm onlyGoran Jakovljevic2015-03-101-1/+1
|/ | | | | | | | | | | Fixes build failure caused by: https://android-review.googlesource.com/#/c/139620/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I181ca29fd7af1bea5bc12f92e84cdee7fb253780
* Merge "Generate sysv hash for libz"Dmitriy Ivanov2015-03-101-0/+4
|\
| * Generate sysv hash for libzDmitriy Ivanov2015-03-101-0/+4
| | | | | | | | | | Bug: 19059885 Change-Id: I3f3f54311bcbd388e2a11cda3d38c1a5c5e4e92f
* | Merge "Add Build type check before using NDK."Elliott Hughes2015-03-101-0/+4
|\ \ | |/ |/|
| * Add Build type check before using NDK.Trevor Drake2015-03-081-0/+4
|/ | | | | | | | | | | Setting the LOCAL_SDK_VERSION will force the module to use prebuilt libraries which ship as part of the ndk and are found at prebuilts/ndk/current/platforms/android-$(LOCAL_SDK_VERSION) We should only use the ndk prebuilts for unbundled build types, i.e when TARGET_BUILD_APPS is not empty Change-Id: I9014fd25fe358ea4454718f05213950e2c77bad8
* Merge "Kill libunz"Elliott Hughes2014-12-101-28/+0
|\
| * Kill libunzTrevor Drake2014-12-101-28/+0
|/ | | | | | | No longer required in the AOSP as the project that depend on this have been switch over to libz Bug: 18571533 Change-Id: I976b37f3d28a57e497208a1bd8cacbe1ba7feb33
* Merge "Add LOCAL_EXPORT_C_INCLUDES_DIRS to library builds."Elliott Hughes2014-12-011-0/+6
|\
| * Add LOCAL_EXPORT_C_INCLUDES_DIRS to library builds.Trevor Drake2014-11-291-0/+6
|/ | | | | | | | | It seems like a good idea to make use of the features provided by the build system. Adding this means projects that depend on libz, libz-host or libunz no longer need to include "external/zlib" in their LOCAL_C_INCLUDES build variable. Change-Id: Icec50daf387017ab26c44cc90beb1687b6d121b3
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 04:58:27 +0000