aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-24Snap for 7230642 from 642d91355e0cef6a728def0a5cd8e3b3f288b5f7 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I90e7adc6f618b514ed14ee921bc2a1ebf69d2175
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libpng" am: eee63db009 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1Treehugger Robot
d2ece84bd7 am: 8952ab4026 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1649711 Change-Id: I4ce4be4a92482a29917c147520c91176ae499979
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libpng" am: eee63db009 am: ↵Treehugger Robot
d2ece84bd7 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1649711 Change-Id: Ida6b9f0b8aabaac0b1e04b7bdb1cca14a125d07e
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libpng" am: eee63db009android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1649711 Change-Id: Ief85850b59e470e931d809d9490d25dd84ab5cdc
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libpng"android-s-beta-2android-s-beta-1Treehugger Robot
2021-03-22[LSC] Add LOCAL_LICENSE_KINDS to external/libpngBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-W3C SPDX-license-identifier-Zlib legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia21fb2fcfcf1b6518dd077e59cb88178a4973bf2
2021-02-21Snap for 7160059 from f1b830124361d1b362f497bcf4fe7ddf45a0f871 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ie3798c491acadd6e4b2e25645c97af0e8d4c715c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3e770d2e94 -s ↵Xin Li
ours am: 03e3255e7e -s ours am skip reason: Change-Id I82bb2e4669f62e3b1ba6e468f753b3009468574a with SHA-1 5c44010b70 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23558db6742385d8bc9b6327f88f34dea74e85f8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3e770d2e94 -s oursXin Li
am skip reason: Change-Id I82bb2e4669f62e3b1ba6e468f753b3009468574a with SHA-1 5c44010b70 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3daecddc6e9421607e38495ee4f8fd6a789ad77c
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I82bb2e4669f62e3b1ba6e468f753b3009468574a Change-Id: I3184e20044b4e2626de93f66ff9f66478063e72c
2020-12-12Snap for 7028922 from 1868b00e81707d40a06fa73862b25127ed949ea9 to sc-d1-releaseandroid-build-team Robot
Change-Id: I586ead8324fa148a2f09323973a96618d522c1ca
2020-12-11Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a am: ↵Treehugger Robot
06705ae977 am: 5c44010b70 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1525814 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c92288049ee3073cdab9c6608921f21fdafbc2a
2020-12-11Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a am: 06705ae977Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1525814 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I82bb2e4669f62e3b1ba6e468f753b3009468574a
2020-12-11Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1525814 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If482ce63ac58970e87ef603c2cb9f32262b9f48a
2020-12-11Merge "arm64: armv7 assembly file is not needed."android-s-preview-1Treehugger Robot
2020-12-10arm64: armv7 assembly file is not needed.Daniel Kiss
Test: build Change-Id: I496dfe54a374d7c2a94436ec7f8dd542e71abd89
2020-12-01Snap for 7002715 from 51cbf916ed6877dc33c2cd40422dd830b2bcca2a to sc-d1-releaseandroid-build-team Robot
Change-Id: Icbb2f1196c4eef11128f6df56c093b93e2b6e81e
2020-11-30Merge "Run the CtsGraphicsTestCases in presubmit for libpng." am: e0dd2789fe ↵Elliott Hughes
am: 572f248e87 am: 1d49ba6d6c Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1507426 Change-Id: I92a8d061f37b3ec9acffd12d4cf15cbd74f3e358
2020-11-30Merge "Run the CtsGraphicsTestCases in presubmit for libpng." am: e0dd2789fe ↵Elliott Hughes
am: 572f248e87 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1507426 Change-Id: Id2638507b7138ae85ea2e7c9cb3dd0277ccf4c7e
2020-11-30Merge "Run the CtsGraphicsTestCases in presubmit for libpng." am: e0dd2789feElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1507426 Change-Id: I510833fd7f5c9c40854ce7b3aac520c835ef01ee
2020-11-30Merge "Run the CtsGraphicsTestCases in presubmit for libpng."Elliott Hughes
2020-11-24Snap for 6991517 from a5d522885e7a91a8bb67875b5674b41119112cfd to sc-d1-releaseandroid-build-team Robot
Change-Id: I62e906d28cc8f39656f168dec50e99a1786ed150
2020-11-24Mark ab/6881855 as merged am: 21cb8b683f am: 58dfd55339Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/13112783 Change-Id: Ida2946f81d5d44939bf1fabbd4806e89e11244bb
2020-11-24Mark ab/6881855 as merged am: 21cb8b683fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/13112783 Change-Id: If47f874d427d16d8466ed78c79c632cfdc0c9f6b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I9eb2f8433327588bcc5437be7d6bba2626301ca4
2020-11-20Run the CtsGraphicsTestCases in presubmit for libpng.Elliott Hughes
Bug: https://issuetracker.google.com/135180511 Test: treehugger Change-Id: I3d545db6eabcb25eaf3aad4f5e58877db2e0162e
2020-11-13Snap for 6970101 from c5360badfae4a147c95772ed0ea041341d1b273c to sc-d1-releaseandroid-build-team Robot
Change-Id: I38c834d21854f80c92b0f2381c47df03c136901b
2020-11-12Merge "Add product_available to product available modules" am: 1030d049af ↵Treehugger Robot
am: 1a597ae5ed am: 786440fa01 am: ad71eeab08 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1495979 Change-Id: I1d37e4ffe87f3c5fb26aabf07f0f3b7c40fd991e
2020-11-12Merge "Add product_available to product available modules" am: 1030d049af ↵Treehugger Robot
am: 1a597ae5ed am: 786440fa01 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1495979 Change-Id: Icd7dd40ba9f0f2c1c6b532d9c7fa6c4068cfc24a
2020-11-12Merge "Add product_available to product available modules" am: 1030d049af ↵Treehugger Robot
am: 1a597ae5ed Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1495979 Change-Id: Ibe082b16e51fc8a6ff9a1161a7947b4c63cb4030
2020-11-12Merge "Add product_available to product available modules" am: 1030d049afTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1495979 Change-Id: Iffe9f118e324b27c248ced6bd7502cefbf9ece8a
2020-11-12Merge "Add product_available to product available modules"Treehugger Robot
2020-11-11Add product_available to product available modulesJustin Yun
vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: I0afeb670766a3c40f3e6b899980d7a3cbd22e1f8
2020-10-14Snap for 6903824 from b5c89fe37c6a8256c073ab47cbc33bfc655fd726 to sc-d1-releaseandroid-build-team Robot
Change-Id: I49fca97b6f589e60e9d152ae17e325c1fc85bcfc
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc" am: 316f7a8cf3 am: ↵Treehugger Robot
4bfa2795f8 am: 2ac99ba09d am: c405b1f8db am: 16d202a990 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1457482 Change-Id: Ia12b5d3024bb09df1e9fd36815a83da122b5440c
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc" am: 316f7a8cf3 am: ↵Treehugger Robot
4bfa2795f8 am: 2ac99ba09d am: c405b1f8db Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1457482 Change-Id: Ie11c7597ca896d9cddf9cdc03622ee422b9525a5
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc" am: 316f7a8cf3 am: ↵Treehugger Robot
4bfa2795f8 am: 2ac99ba09d Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1457482 Change-Id: Id1e27170939b2d21718e6243b8accba82b534c95
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc" am: 316f7a8cf3 am: 4bfa2795f8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1457482 Change-Id: I71ce3003fcb6c07029a8cffc741b1e3a70261bf8
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc" am: 316f7a8cf3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1457482 Change-Id: I137adb94116c65e0092b78ac34f2d1c7aa9fd2fe
2020-10-13Merge "Add fuzz target for libpng_read_fuzzer.cc"Treehugger Robot
2020-10-13Add fuzz target for libpng_read_fuzzer.ccBranden Archer
Bug: 170243740 Test: Builds and runs Change-Id: Icde1a3379aab3174a36706e83495fd6e1f1b4494
2020-09-17Snap for 6841863 from 2aad95b3d1ef486a8e92a5a2a15f044c28e383f0 to sc-d1-releaseandroid-build-team Robot
Change-Id: I35dd05d2121c37b7458cf0ab97fe3723f887d6af
2020-09-16[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: a947022e8d -s ours am: eb57d6a2c7 -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: I03c3c1b703837c7c6e80bd2989ecfc7e1685e207
2020-09-16[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: a947022e8d -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: Ia39035873afcee1b0c7a0ab2f6e6dcb9ab0a7404
2020-07-15Snap for 6680681 from 785b6b5c8e5f80db21c7874afcf0862f6727e799 to sc-d1-releaseandroid-build-team Robot
Change-Id: I27e9bf040e7ed47c1f93c1ab4574aae273ae5bba
2020-07-14[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: 469cbcab73 am: 9e1f873b22 -s ours am: c8123a5bfa -s ours am: 4eae530213 -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: If749e0ee1e5d3611f1b4d3b7bbdf69b17b17ac62
2020-07-14[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: 469cbcab73 -s ours am: 27dc0c0f45 -s ours am: ea27ed8123 -s ours am: 60575660ed -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: I8b0de3d395bbb9f8f4c9b5961152f168e0b2cff1
2020-07-14[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
-s ours am: d6f096359a -s ours am: 294333eca8 -s ours am: b5561d1d2e -s ours am: 2971a9e23f -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 a6fb505286 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: Ife0f831f940d96d5b6381c7a4618bcea6a7441f6
2020-07-14[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: 469cbcab73 am: 9e1f873b22 -s ours am: c8123a5bfa -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: Id8fccaa17ac28b8596a5c57bd3b93bd17b3b6cc3
2020-07-14[automerger skipped] Make libpng buildable for native_bridge am: dff687c088 ↵Victor Khimenko
am: 469cbcab73 am: 9e1f873b22 -s ours am skip reason: Change-Id Icdaec158a0a9fb2f0c3bdf0796e834346578e620 with SHA-1 dff687c088 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/12128186 Change-Id: I785de6cba0fc551926e193ab95db265844875fe5