summaryrefslogtreecommitdiff
path: root/Android.mk
AgeCommit message (Collapse)Author
2016-07-12Convert libz to SoongDan Willemsen
Change-Id: I04a358cf41f86ee6d090f9f7c90870f5cc44483a
2016-07-07Remove TARGET_BUILD_APPS conditionalDan Willemsen
There aren't any users of this conditional anymore, and new users will be caught with the ndk link check. Change-Id: Ia692333f2b796f9b18d7f67adc1db78d68d63f0d
2016-03-10Add zlib_fingerprint file.Sen Jiang
This file stores the SHA256 hash of all the .c and .h files. It will be checked by update_engine for imgdiff compatibility. Test: mma Bug: 27156099 Change-Id: Ifb86192ec0f7d2f671b41b424fa86e5dbd572ae1
2015-11-30Remove LOCAL_NDK_STL_VARIANTColin Cross
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
2015-11-30Fix typoColin Cross
LOCAL_NDK_STL_VARIANT, not LOCAL_NDL_STL_VARIANT. Bug: 25904002 Change-Id: I295fb514b2ec041f3041d8bca5dc2920de4feb95
2015-11-30Use LOCAL_NDK_STL_VARIANT instead of LOCAL_CXX_STLColin Cross
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
2015-11-30Remove STL dependencyColin Cross
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
2015-09-28Fix bug number for linker related workaroundsDmitriy Ivanov
Bug: http:/b/24425865 Change-Id: I646378190ef2fe023d32ecdc154014b4c58b8bb6
2015-08-28Whitelist windows modulesDan Willemsen
Bug: 23566667 Change-Id: Iee4a18aca8bd68e0527ea6dd977c43e3d4ed239c
2015-08-14Always use the NDK for unbundled branches.Dan Albert
Bug: http://b/23221721 Change-Id: I40c0c17d219580866733eedb2352681455bf7511
2015-05-08Switch libz.so to hash-style=bothDmitriy Ivanov
Bug: http://b/19059885 Change-Id: Ia0ae87217720fb1c6b334af3548545b143054c89
2015-03-13Switch libz to sysv-only hash styleDmitriy Ivanov
Bug: 19059885 Change-Id: I339b873d6b8f2bc847bf225bcf50d57e543f8647
2015-03-10Generate gnu hash for arm onlyGoran Jakovljevic
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
2015-03-10Merge "Generate sysv hash for libz"Dmitriy Ivanov
2015-03-10Generate sysv hash for libzDmitriy Ivanov
Bug: 19059885 Change-Id: I3f3f54311bcbd388e2a11cda3d38c1a5c5e4e92f
2015-03-08Add Build type check before using NDK.Trevor Drake
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
2014-12-10Kill libunzTrevor Drake
No longer required in the AOSP as the project that depend on this have been switch over to libz Bug: 18571533 Change-Id: I976b37f3d28a57e497208a1bd8cacbe1ba7feb33
2014-11-29Add LOCAL_EXPORT_C_INCLUDES_DIRS to library builds.Trevor Drake
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
2014-06-05Build host with multilib both enabled.Ian Rogers
Change-Id: Ieb22dec4d3f810efeed93abe2238a75e451e2a06
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
2012-08-14Retire LOCAL_NDK_VERSION.Ying Wang
Bug: 6932421 Change-Id: I4be6c58355635735ca26c7dcbc7f14d08e5c4319
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-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-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-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
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-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-09auto import from //branches/cupcake/...@125939The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0cdma-importThe Android Open Source Project