aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-16Merge "Remove sanitize:never" am: ad4a6db68e am: 29a3a9a086android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Evgenii Stepanov
am: b6c44fb27f Change-Id: If162431d8a02d8f72a9234c2a8defac63cd99548
2016-12-16Merge "Remove sanitize:never" am: ad4a6db68eEvgenii Stepanov
am: 29a3a9a086 Change-Id: I8df1507127399dabfa31608db12da6a5b8d7a8c5
2016-12-16Merge "Remove sanitize:never"Evgenii Stepanov
am: ad4a6db68e Change-Id: Idce6e83bd865d79bc32f3967efef4b934360b632
2016-12-16Merge "Remove sanitize:never"android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-previewEvgenii Stepanov
2016-12-15Remove sanitize:neverEvgenii Stepanov
The one in the device static library was originally added to prevent linking of sanitized libpng.a into a non-sanitized static executable. Soong handles this automatically. The one in the ndk library target is an unnecessary copy, AFAIK. Bug: 33091541 Test: SANITIZE_TARGET=address keeps working Change-Id: I0e821a37efadce398edb6350ddd526f79091c036
2016-11-24Merge "Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Matt Sarett
pngpread.c."" am: 03e96d17ed am: 631e6bb8f9 am: 1c18e35f8e Change-Id: I623c113a10f42dc83c766c04cb2f442157b540a1
2016-11-24Merge "Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Matt Sarett
pngpread.c."" am: 03e96d17ed am: 631e6bb8f9 Change-Id: I173a6152df4448906e0f6dd936504ccf7b11e849
2016-11-24Merge "Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Matt Sarett
pngpread.c."" am: 03e96d17ed Change-Id: I85686e02b36a3482e666875114f18dcaf727310c
2016-11-24Merge "Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Treehugger Robot
pngpread.c.""
2016-11-24Merge "Revert "libpng: Upgrade to 1.6.26"" am: 51e126759e am: a5355dcbe7Matt Sarett
am: d8b64fce3d Change-Id: Id6b8e4036ad4b4cffebce035ac76c166fd12dc76
2016-11-24Merge "Revert "libpng: Upgrade to 1.6.26"" am: 51e126759eMatt Sarett
am: a5355dcbe7 Change-Id: Ibb45022a283a1fc7cc8624c391debe8928ac74ac
2016-11-24Merge "Revert "libpng: Upgrade to 1.6.26""Matt Sarett
am: 51e126759e Change-Id: I88fb5af48304653fa7489a79c921374be1da852d
2016-11-24Merge "Revert "libpng: Upgrade to 1.6.26""Treehugger Robot
2016-11-23Revert "libpng: Upgrade to 1.6.26"Matt Sarett
This reverts commit 3586ba4f3287ed6a9e6e15b01b717e2cf1bd8647. https://b.corp.google.com/u/1/issues/33057876 Change-Id: I2c0ea5e3feba74f70009d6ccda4e43b32a17b832
2016-11-23Revert "[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c."Matt Sarett
This reverts commit 8c0c9e14afdd03610a9802eda4805a5f0d326375. https://b.corp.google.com/u/1/issues/33057876 Change-Id: I7be19ecda436bf2ee931fd9b0d334b5a4362574c
2016-11-22Merge "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Glenn Randers-Pehrson
pngpread.c." am: b65760761b am: 9352c761c0 am: 7b9776ce72 Change-Id: Ic474612cc1ce7ebd7243e7567ef9f6beca9cfeea
2016-11-22Merge "[libpng16] Revert ADLER32 error handling in pngrutil.c and ↵Glenn Randers-Pehrson
pngpread.c." am: b65760761b am: 9352c761c0 Change-Id: I00796f91c652b52e06c0130ed48d274b25ecdc6b
2016-11-22Merge "[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c."Glenn Randers-Pehrson
am: b65760761b Change-Id: I989053b622d9cca724cf6354e043729fdb2d78a1
2016-11-22Merge "[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c."Treehugger Robot
2016-11-21[libpng16] Revert ADLER32 error handling in pngrutil.c and pngpread.c.Glenn Randers-Pehrson
Change-Id: If8bd77a3fea39c6a8e33daca8d61c8d43a5fb77c Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2016-11-17Merge "libpng: Upgrade to 1.6.26" am: 6e4f16bef1 am: c45d9f1df7Alex Naidis
am: bfe461ffa3 Change-Id: I526073825a703cd4068e86d36ddc72b342a4a986
2016-11-17Merge "libpng: Upgrade to 1.6.26" am: 6e4f16bef1Alex Naidis
am: c45d9f1df7 Change-Id: I22a3e0c16d378350a31f8876f519b70ad42023b3
2016-11-17Merge "libpng: Upgrade to 1.6.26"Alex Naidis
am: 6e4f16bef1 Change-Id: Ia8c0dd571f8fe6d7fdfa137b216d4b1123d6d436
2016-11-17Merge "libpng: Upgrade to 1.6.26"Treehugger Robot
2016-11-01libpng: Upgrade to 1.6.26Alex Naidis
This release contains many minor and important fixes. Libpng 1.6.26 released on October 20, 2016 Change-Id: If647f42a1fb4d7022286010d262d289dac4030df Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2016-11-01Merge "Convert Android.mk to Android.bp" am: 0bbba1b525 am: a9db5cc452Colin Cross
am: f10ad1e3b2 Change-Id: Icb4ff3be94149b7b6338c125bfc098d7853f196a
2016-11-01Merge "Convert Android.mk to Android.bp" am: 0bbba1b525Colin Cross
am: a9db5cc452 Change-Id: I724870a91ff32c33ad2f65b53fc033e53c60ec79
2016-11-01Merge "Convert Android.mk to Android.bp"Colin Cross
am: 0bbba1b525 Change-Id: If3f8835f77b52929a17a97a19fb33db5b1cce3fd
2016-11-01Merge "Convert Android.mk to Android.bp"Colin Cross
2016-10-31Convert Android.mk to Android.bpColin Cross
See build/soong/README.md for more information. Also moves pngtest to build as a test (installs to nativetest, builds for 32-bit and 64-bit), and enable building it on the host. Also moves NEON selection to be determined based on compiler flags. Test: mmma -j external/libpng Test: out/host/linux-x86/nativetest64/pngtest/pngtest Test: m -j Change-Id: I25b58541cfd6153b60977d24f2af4ed086312b82
2016-10-17Merge "libpng: Upgrade to 1.6.25" am: c7ef736131Alex Naidis
am: a481d8aa5c Change-Id: I994e8fe6ebbd25dd57efd244f946250b3bb481fb
2016-10-17Merge "libpng: Upgrade to 1.6.25"Alex Naidis
am: c7ef736131 Change-Id: I5a79a4badb569a0c7ebceaa119c50007c98429e0
2016-10-17Merge "libpng: Upgrade to 1.6.25"Treehugger Robot
2016-10-16libpng: Upgrade to 1.6.25Alex Naidis
The changes from 1.6.22 (beta) to 1.6.25 (final) include many general fixes, fixes for memory leak issues and optimizations in order to improve performance. Also upstream added support for the MIPS platform. Support for Intel SSE isn't built in any more. For support a patch in contrib/intel/intel_sse.patch has to be applied. This patch additionally documents this in README.android as an Android specific addition. The patch for Intel SSE support from upstream applied cleanly. Libpng 1.6.25 released on September 1, 2016. Test: built for ARM and checked whether NEON optimizations were compiled built for x86/x86_64 and checked whether SSE optimizations were compiled Change-Id: If647f42a1fb4d7022286010d262d287dac4030df Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2016-06-17resolve merge conflicts of 55caa15 to stage-aosp-master am: 2694c6a594Elliott Hughes
am: 5a4f8316df Change-Id: Ib347a61b7e83521eb36a7042a608af1daa66304d
2016-06-17resolve merge conflicts of 55caa15 to stage-aosp-masterandroid-n-mr1-preview-2android-n-mr1-preview-1Elliott Hughes
am: 2694c6a594 Change-Id: Ie59976f602e937366c10fbf2ed89fc0676926c90
2016-06-16resolve merge conflicts of 55caa15 to stage-aosp-masterElliott Hughes
Change-Id: I5fdab7ea6b35331c5bd6c1e56e226d78d4a5b52a
2016-06-17Merge "Add -Wno-unused-parameter to libpng."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot
2016-06-16Add -Wno-unused-parameter to libpng.Elliott Hughes
Change-Id: I1b0398a35c1a4bf099f8836ad965792b59ec92c0
2016-06-13Merge "Turn off intel optimizations for host lib am: 4e88d040b7 am: ↵Android Build Merger (Role)
106a9f5260" into nyc-mr1-dev-plus-aosp
2016-06-13Turn off intel optimizations for host lib am: 4e88d040b7Adam Lesinski
am: 6f25ce204f Change-Id: I8dfb2b611e52d29c54170151e9646ec32075a024
2016-06-13Turn off intel optimizations for host lib am: 4e88d040b7Adam Lesinski
am: 106a9f5260 Change-Id: I4c58fa3399bc5c4720c4c0967dfc7c9e99de9fd7
2016-06-13Turn off intel optimizations for host libAdam Lesinski
am: 4e88d040b7 Change-Id: Ib028d9fe00cdd13b7201c30282c404af18eaa443
2016-06-13Turn off intel optimizations for host libandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseAdam Lesinski
am: 4e88d040b7 Change-Id: Id8d8c28ed3230f879646297c0976898385086d95
2016-06-10Turn off intel optimizations for host libnougat-devAdam Lesinski
AAPT on Windows crashes with these optimizations turned on. Bug:29279685 Change-Id: I209f49b7465be75535cbb7d2de6d0f2754e97717
2016-05-19DO NOT MERGE Update libpng to 1.6.20 am: cf8a579007 am: a0b5142c6c am: ↵Matt Sarett
34dcc2af83 -s ours am: 3aec76d873 -s ours am: 9cac6eee10 am: c34faaeec7 am: 8ecc2c0512 -s ours am: 89d19aa8f1 am: 9a9e74b2ec am: 0f95eaef8e am: fd18529232 -s ours am: aa0664c5f8 am: f724ab3959 * commit 'f724ab39595265a257d8a1c161fcc839b4af9066': Change-Id: I8c948719cf8a7dbde9e5bb1254a51d260761d63b
2016-05-19DO NOT MERGE Update libpng to 1.6.20 am: cf8a579007 am: a0b5142c6c am: ↵Matt Sarett
34dcc2af83 -s ours am: 3aec76d873 -s ours am: 9cac6eee10 am: c34faaeec7 am: 8ecc2c0512 -s ours am: 89d19aa8f1 am: 9a9e74b2ec am: 0f95eaef8e am: fd18529232 -s ours am: aa0664c5f8 am: 01f9a372ce * commit '01f9a372ce004944bbaa0c1497d9ea8ace646b06': DO NOT MERGE Update libpng to 1.6.20 Change-Id: Id2216eb8d6bf23ea1725e982ef558457b00b3ada
2016-05-19DO NOT MERGE Update libpng to 1.6.20 am: cf8a579007 am: a0b5142c6c am: ↵Matt Sarett
34dcc2af83 -s ours am: 3aec76d873 -s ours am: 9cac6eee10 am: c34faaeec7 am: 8ecc2c0512 -s ours am: 89d19aa8f1 am: 9a9e74b2ec am: 0f95eaef8e am: fd18529232 -s ours am: aa0664c5f8 * commit 'aa0664c5f8c982896845eb73c4ae2c06ad3fe879': DO NOT MERGE Update libpng to 1.6.20 Change-Id: I432c14f6836d0fa0302ead6eb36696054f0bcced
2016-05-19DO NOT MERGE Update libpng to 1.6.20 am: cf8a579007 am: a0b5142c6c am: ↵Matt Sarett
34dcc2af83 -s ours am: 3aec76d873 -s ours am: 9cac6eee10 am: c34faaeec7 am: 8ecc2c0512 -s ours am: 89d19aa8f1 am: 9a9e74b2ec am: 0f95eaef8e am: fd18529232 -s ours am: aa0664c5f8 * commit 'aa0664c5f8c982896845eb73c4ae2c06ad3fe879': DO NOT MERGE Update libpng to 1.6.20 Change-Id: Idf1312b70f0c251890a864ab149af0dee7914c41
2016-05-19DO NOT MERGE Update libpng to 1.6.20 am: cf8a579007 am: a0b5142c6c am: ↵Matt Sarett
34dcc2af83 -s ours am: 3aec76d873 -s ours am: 9cac6eee10 am: c34faaeec7 am: 8ecc2c0512 -s ours am: 89d19aa8f1 am: 9a9e74b2ec am: 0f95eaef8e am: fd18529232 -s ours * commit 'fd1852923233f8430da35126201245bcc06ac4e6': DO NOT MERGE Update libpng to 1.6.20 Change-Id: I4d46b6b8fcc4bcf613b4d454e92c0cd4356784dc