aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 77a88c0b05 Change-Id: I3d5b24aa2cbc18ad3c106052d724105a0cb934e5
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I815cdd40657a568f68cc50552af2735906aefefe
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I8ff52d50c5769b6d22f72bb9b60e6de6683f33f4
2019-01-17Merge "Add default code reviewers into OWNERS" am: 7ab540bb24 am: e206bd344bChih-hung Hsieh
am: e7c582ab3b Change-Id: Id0c6bdfa7bc0d62e59b2d382449c0852155a6b7a
2019-01-17Merge "Add default code reviewers into OWNERS" am: 7ab540bb24Chih-hung Hsieh
am: e206bd344b Change-Id: Icaf754e869fdd12ea3e98f162911679cefbac71e
2019-01-17Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 7ab540bb24 Change-Id: I82f5c4de4e87b5cf4a4c5416265b6b3bfd543b0f
2019-01-17Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-17Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I6d5d0641ca25e115923fed15f6fc449621f4f4bf
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 2f4a5d7c42 -s ours am: 7a2b55c047 -s ours am: 79afc2c60a -s ours Change-Id: Ic738180fc81069698d37c38d2b5a5268ad5aaa5c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 2f4a5d7c42 -s ours am: 7a2b55c047 -s ours Change-Id: I1fdd9586d3d60cdb0882b98f684a74018b953f50
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 2f4a5d7c42 -s ours Change-Id: Ib0a5798c46eb78c14d4d2bed7eb2174893a456ee
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I763cdccb66631c589227158bae8e75d016acbc26
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 242b5090b0 -s ours am: 7af47f7b39 -s ours Change-Id: Id7d4c07bf83164ab6745c0d162d36ed457cef09d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 242b5090b0 -s ours Change-Id: I45f11b482ae26f7b30fbd394814da1f64c2d91eb
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I04bbb202a8709ab12f2564c4acd9e4fe4ec27210
2018-08-29Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED" am: 4bc5f654f4 am: 7cfd88bba9Leon Scroggins III
am: 1bf0c27e56 Change-Id: I4cce55eb365408aaea7422c289479f708cd1b18a
2018-08-29Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED" am: 4bc5f654f4Leon Scroggins III
am: 7cfd88bba9 Change-Id: I0450db21d43160e19174c4c0787289c9e7ffb738
2018-08-29Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED"Leon Scroggins III
am: 4bc5f654f4 Change-Id: Idb1fb703cdc8b7ac158312448f190207ed4bed50
2018-08-29Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-28Undefine PNG_READ_OPT_PLTE_SUPPORTEDLeon Scroggins III
Bug: 113211371 Test: not feasible - this prevents out of bounds read With PNG_READ_OPT_PLTE_SUPPORTED defined, a PLTE chunk following a tRNS chunk will negate the tRNS chunk for an image which is not paletted. The result is that we may read out of bounds. Change-Id: I4c6032e077b220f8349ab9e7c4102c460d1a7ea2
2018-08-01Merge "Make libpng recovery_available" am: 4b8da58d51 am: 62f5255389 am: ↵Tao Bao
ec756c3e7a am: e76b621e28 Change-Id: I6372f76314059de504007dc64a211eb3f3087248
2018-08-01Merge "Make libpng recovery_available" am: 4b8da58d51 am: 62f5255389Tao Bao
am: ec756c3e7a Change-Id: I3ced522d1de161f810a7fcdcb8797bb3dbabb7c6
2018-08-01Merge "Make libpng recovery_available" am: 4b8da58d51Tao Bao
am: 62f5255389 Change-Id: I0cfb33135f3bd20bfd08156a0d369a9ac88876f4
2018-08-01Merge "Make libpng recovery_available"android-o-mr1-iot-release-1.0.3Tao Bao
am: 4b8da58d51 Change-Id: Idcd89a413aa7efc4bc7ccc36f64d0c63e5bd6624
2018-08-02Merge "Make libpng recovery_available"Tao Bao
2018-07-17Make libpng recovery_availableJerry Zhang
Bug: 110380063 Test: Compiles, recovery works Change-Id: Ia48da40661720b216fa04a6d7335cbe945d5f96f
2018-04-20[automerger skipped] Merge "Mark libpng as double_loadable" am: c85cbbda3d ↵Jiyong Park
am: bccea7a861 am: f706b17cd5 -s ours Change-Id: I9caa8493c49f1f0a6cd70b80751fb1758f974907
2018-04-20Merge "Mark libpng as double_loadable" am: c85cbbda3dJiyong Park
am: bccea7a861 Change-Id: I7040e0723974f51eab0c8ee059568b73d15778df
2018-04-20Merge "Mark libpng as double_loadable"Jiyong Park
am: c85cbbda3d Change-Id: I4f81d20c65fcd71d1e412b1c3c7057ec1e0db89a
2018-04-21Merge "Mark libpng as double_loadable"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7Treehugger Robot
2018-04-18Mark libpng as double_loadableJiyong Park
libpng is explicitly marked as double_loadable since it is one of the (indirect) dependencies of the LLNDK library libnativewindow (libft2 -> libpng) and at the same time the lib itself is marked as VNDK. Such lib can be double loaded inside a vendor process. Note: even without this change, the library is already capable of being double loaded due to the dependency graph around it. This change is to make it explicit so that double loading of a library is carefully tracked and signed-off by the owner of the lib. Bug: 77155589 Test: m -j Merged-In: I9668ec31a1aca0305bd7bd7c0687d2ad331e221d Change-Id: I9668ec31a1aca0305bd7bd7c0687d2ad331e221d (cherry picked from commit 5e8fc8e43145ed2d323bd2a52fe5ebce6be273cb)
2018-04-10Mark libpng as double_loadableJiyong Park
libpng is explicitly marked as double_loadable since it is one of the (indirect) dependencies of the LLNDK library libnativewindow (libft2 -> libpng) and at the same time the lib itself is marked as VNDK. Such lib can be double loaded inside a vendor process. Note: even without this change, the library is already capable of being double loaded due to the dependency graph around it. This change is to make it explicit so that double loading of a library is carefully tracked and signed-off by the owner of the lib. Bug: 77155589 Test: m -j Change-Id: I9668ec31a1aca0305bd7bd7c0687d2ad331e221d
2017-10-10Snap for 4386413 from 6e267ffb6f981d1abd9913c5d0d9856771254fdb to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I9d72116e5e4a7a3b7618119cb42ba782d2c7de0b
2017-10-09Merge "Use -Werror in external/libpng" am: de8ed1e343 am: adebdf2260 am: ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devChih-hung Hsieh
f9d17bb77f am: e500fa038e Change-Id: I96a6cff405085b78a217493976a5313bcfa33e71
2017-10-09Merge "Use -Werror in external/libpng" am: de8ed1e343 am: adebdf2260android-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Chih-hung Hsieh
am: f9d17bb77f Change-Id: I79e98ca431190564dc80fd418c03c1dd2c23f99d
2017-10-09Merge "Use -Werror in external/libpng" am: de8ed1e343Chih-hung Hsieh
am: adebdf2260 Change-Id: I057959c190514844b57097c5dfa8426ab33a2ab5
2017-10-09Merge "Use -Werror in external/libpng"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh
am: de8ed1e343 Change-Id: I3a1bb650da85b33d278847d1b6c2314258f9e1ff
2017-10-09Merge "Use -Werror in external/libpng"Chih-hung Hsieh
2017-10-07Snap for 4383207 from 1ef9ccdb740c31e0b23ee7a7839510cfba3abfec to pi-releaseandroid-build-team Robot
Change-Id: I9eb390f1d6318ceeeca385f4c24dfa53ce2fd6e1
2017-10-06Merge "Update to 1.6.34" am: 2b58cadf4b am: 209c502a3a am: de60e5a48aLeon Scroggins III
am: ac43a3b348 Change-Id: Iefb655051572031ab669ef534f32ec91e180f319
2017-10-06Merge "Update to 1.6.34" am: 2b58cadf4b am: 209c502a3aLeon Scroggins III
am: de60e5a48a Change-Id: I50bb7f6d74299ca9a9cbe60d5de07bb95e62c39f
2017-10-06Merge "Update to 1.6.34" am: 2b58cadf4bLeon Scroggins III
am: 209c502a3a Change-Id: I5cddec8d4199888f0a1deb1edb578a92dbc942e2
2017-10-06Merge "Update to 1.6.34"Leon Scroggins III
am: 2b58cadf4b Change-Id: I1c64b33803ffd5fda12b83604e9f59d90ed9f5f8
2017-10-06Merge "Update to 1.6.34"Treehugger Robot
2017-10-06Update to 1.6.34Leon Scroggins III
Test: Covered by existing tests. This is the same version we will use in Chromium: https://chromium-review.googlesource.com/c/chromium/src/+/704209 https://github.com/glennrp/libpng/commit/edef058e180be435afd8feebb742a22360a7fa3f (included in this revision) moved the SSE opts directly into the main libpng source, so contrib/intel/intel_sse.patch is no longer necessary, as its changes are already included. Adds *all* code, rather than selecting just the code we use. Other changes: - README.android: - Update version - Android.mk -> Android.bp - Remove no longer relevant comment about applying the intel patch - Remove comment about deleting unused files - README.version: - Update version and source link Change-Id: Ib24cfcfec3e2f63eed8b3b9f0920b1018b30dd64
2017-09-30release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370 ↵android-build-team Robot
135 snap-temp-L93500000107644030 Change-Id: I7768a77a589e2a14673547298018d1396de8bca6
2017-09-29Merge "Rename libz-host -> libz" am: 772123003e am: d12c507abf am: cd2ecdb993Dan Willemsen
am: 0efd17c961 Change-Id: I0282975b70574947f6868a1efb43305f1d320f34
2017-09-29Merge "Rename libz-host -> libz" am: 772123003e am: d12c507abfDan Willemsen
am: cd2ecdb993 Change-Id: Iebd4ad7523bb6e7eb8e51bf2c68b7c53a1250195
2017-09-29Merge "Rename libz-host -> libz" am: 772123003eDan Willemsen
am: d12c507abf Change-Id: I016a43ec6d61eeeb4183c2f96b7899688f76b29a
2017-09-28Merge "Rename libz-host -> libz"Dan Willemsen
am: 772123003e Change-Id: I2138b148278d2bef6d0f6e58dc4b9f5c9b22526f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 00:45:36 +0000