aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 71ee2251f4 -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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-devandroid12--mainline-releaseXin Li
ours am: 6c23452e90 -s ours am skip reason: Change-Id I5674a034179c0c62c40b27565c23df46e6587901 with SHA-1 1a84e3d749 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie21d558275f6d7580a9963d72d5cba92ed30b962
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 71ee2251f4 -s oursXin Li
am skip reason: Change-Id I5674a034179c0c62c40b27565c23df46e6587901 with SHA-1 1a84e3d749 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I03d842870375cde15b72659f442ef293435e23ea
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I5674a034179c0c62c40b27565c23df46e6587901 Change-Id: I406e41a42b79a20b06cdbcc091f9f7a2a978894d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/skqp am: 45462d4b60 am: 5e438b355e ↵Bob Badour
am: 5741279230 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1588977 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b464c1a5a872a45704fda7a4f07c8d62b9f3162
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/skqp am: 45462d4b60 am: 5e438b355eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1588977 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8981185cf267ed7ce307e10f0f7111b0d6d6e2e9
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/skqp am: 45462d4b60Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1588977 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbd4e91af40e9cfc4d0e1d319b068a21950043f7
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/skqpandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-FTL SPDX-license-identifier-MIT SPDX-license-identifier-MPL legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-MIT legacy_unencumbered to: platform_tools/android/apps/skqp/src/main/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I818391613d2004a6d3672b1251a1b3b702f8d095
2021-02-11Remove SkQP from all required test suites.Derek Sollenberger
Since its inception many of SkQP test cases have been covered by deQP and other CTS packages. SkQP has begun to lag behind the most recent versions of Skia and offers diminishing value until it can be brought to parity with Skia's current testing capabilities. Test: make Bug: 177909514 Change-Id: I2cf968f0fc7b3e2ceff5cd7bd134974ecb776f3f
2020-11-25Mark ab/6881855 as merged am: 06dac175f1 am: 1a84e3d749Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/13112961 Change-Id: Ibd4fdfeb1cecd67e553f7130bd1f3caebeb0fd9f
2020-11-25Mark ab/6881855 as merged am: 06dac175f1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/13112961 Change-Id: I5674a034179c0c62c40b27565c23df46e6587901
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: If0ab947f5afbd04e4022ac73bd6e36d2f355f9d5
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: 6bececcdca -s ours am: ↵Xin Li
3e7646db77 -s ours am: e300942db7 -s ours am skip reason: Change-Id Icfea3f68cef8641b394431048fbcd2f2ce176f4e with SHA-1 43bf3b8d1c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12797348 Change-Id: I40f1d66eb8e6ad45a7cc2a191ebd3b7e38119a46
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6bececcdca -s ours am: ↵Xin Li
3e7646db77 -s ours am skip reason: Change-Id Icfea3f68cef8641b394431048fbcd2f2ce176f4e with SHA-1 43bf3b8d1c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12797348 Change-Id: Ib53eefa4df7e0b81a0561500be0900b01d8701c4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6bececcdca -s oursXin Li
am skip reason: Change-Id Icfea3f68cef8641b394431048fbcd2f2ce176f4e with SHA-1 43bf3b8d1c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12797348 Change-Id: Ibd5b58b9c9e7d236960fcda6ab53e33c7ba476af
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Icfea3f68cef8641b394431048fbcd2f2ce176f4e Change-Id: I61e3979b2328ee5284bd68fdb81b0808aa6cf9ea
2020-09-16[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 ↵Xin Li
am: b9a7b3303d -s ours am skip reason: Change-Id Ia93f243b01ddcbd23d5516552b2d492df18c0ade with SHA-1 b36625a2d2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I4ef1952fac522742a53a940308bfa6318d77acf9
2020-09-14Remove tests that require large malloc allocations. am: e6618177da am: ↵Derek Sollenberger
74bf4afe3c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/11852616 Change-Id: If34930179d24f711fc7119492f55270deb24bffd
2020-09-13[automerger skipped] remove pointer tagging hack in SkRecord am: 6d7c94c1eb ↵Mike Klein
am: 58e0e61329 -s ours am skip reason: Change-Id I1a78dd4e1b9b18dd02738bb1dfbbb968f29675bc with SHA-1 5d4e25e03b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/11414622 Change-Id: Ia8b30ce851f64f934c5ec5eb51b9446806591c17
2020-09-11[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 ↵Xin Li
-s ours am: 87b1f7f152 -s ours am: 83a95d8828 -s ours am: 54aa872e19 -s ours am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: Ia89bd74258cfe8a8957ccb9f4b908f370b0a8370
2020-09-11[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 ↵Xin Li
-s ours am: 87b1f7f152 -s ours am: 83a95d8828 -s ours am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: I58e85e7be463b3e458f326929b3bdbe07c118e44
2020-09-11[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 ↵Xin Li
-s ours am: 87b1f7f152 -s ours am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: I8685dae8d18f1850613f42ac8911f650d518839d
2020-09-11[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 ↵Xin Li
-s ours am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: Ie237b4b66f28c45e26f214e5ebdc942e24276ee8
2020-09-11[automerger skipped] Merge Android R am: 748c4d5c0b -s oursXin Li
am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: Ifd2de4c0b4aeec5a8e8ff57f74ed1b91c6eba26e
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ib6931e3695458d743667dff2d59acfd156415019 Change-Id: I6912598bd18f5a7ded5182aa767633de4a47b0f2
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: e3b1744330 -s ours am: 8f3b76a545 -s ours am: f2fc71819f -s ours am: 06095f588c -s ours am skip reason: Change-Id I351000b81430c58bde24de7de6e401a18ef29f56 with SHA-1 671129d47a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12470166 Change-Id: Ia745765d22b3fb3ee1926c4b76d72a5e05345cf8
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: e3b1744330 -s ours am: 8f3b76a545 -s ours am: f2fc71819f -s ours am skip reason: Change-Id I351000b81430c58bde24de7de6e401a18ef29f56 with SHA-1 671129d47a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12470166 Change-Id: I810b564a560da887b021229d317892ab6e0136f4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: e3b1744330 -s ours am: 8f3b76a545 -s ours am skip reason: Change-Id I351000b81430c58bde24de7de6e401a18ef29f56 with SHA-1 671129d47a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12470166 Change-Id: I8711dbd61ac4d3f82ff4ddb0a7f386c0536c87e5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: e3b1744330 -s ours am skip reason: Change-Id I351000b81430c58bde24de7de6e401a18ef29f56 with SHA-1 671129d47a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12470166 Change-Id: Ib78d2b06f57e98d896b0cc3abd7e558fc1cc1090
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I351000b81430c58bde24de7de6e401a18ef29f56 Change-Id: Ib6931e3695458d743667dff2d59acfd156415019
2020-08-18Add android:exported values to all SkQP activities. am: 4a4c793f12 am: ↵Derek Sollenberger
b089dc723a am: 0cf6c4ced7 am: e9f6a3d775 am: b93baa4cd5 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: Ib9e18f475ef0b0d22060c0db86aa231f64d3ba64
2020-08-18Add android:exported values to all SkQP activities. am: 4a4c793f12 am: ↵Derek Sollenberger
b089dc723a am: 0cf6c4ced7 am: e9f6a3d775 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: I35b57425083e0e0a61758db4d4d85d80412f49f7
2020-08-18Add android:exported values to all SkQP activities. am: 4a4c793f12 am: ↵Derek Sollenberger
b089dc723a am: 0cf6c4ced7 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: Iac64ce7149751f2088c232e8b7f036ebc4844cb6
2020-08-18Add android:exported values to all SkQP activities. am: 4a4c793f12 am: ↵Derek Sollenberger
b089dc723a Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: I88699d2c2602a2f25143a993ba823d1938fc3c08
2020-08-18Add android:exported values to all SkQP activities. am: 4a4c793f12Derek Sollenberger
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: I948335e485a2354fd4960debd0f3f8c04316e48f
2020-08-17Add android:exported values to all SkQP activities.Derek Sollenberger
This fixes an issue on newer versions of Android where activities with intent filters need to specify whether or not they are exported in order to successfully complete installation on a test device. Bug: b/163792247 Test: successful install on device with AOSP build Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309980 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com> (cherry picked from commit 9f67b06583505b786a5244f5920cb98b3a8a7deb) Change-Id: I5f7bfe4d1afe8f532ba7d4efdb3f069ac3b6003d
2020-07-24[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev am: ↵Automerger Merge Worker
cc2381c482 am: 7bd81fc2ed am: 21e70f4e18" into rvc-qpr-dev-plus-aosp am: f831086f82 -s ours am skip reason: Change-Id Ia93f243b01ddcbd23d5516552b2d492df18c0ade with SHA-1 b36625a2d2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: Id5560b9e1b8922622cec1fdf741b1a65f3345dd2
2020-07-24[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 ↵Xin Li
am: dedb01c972 am: 43bf3b8d1c -s ours am: b8524928f9 -s ours am skip reason: Change-Id Ia93f243b01ddcbd23d5516552b2d492df18c0ade with SHA-1 b36625a2d2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I218e2d075638a3882e7424c430c883333c456327
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2ed am: ↵Xin Li
c2b247d72e am: a1899d17a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I4dec961575db22444abd7cde44194418b782ef10
2020-07-24Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: ↵Automerger Merge Worker
7bd81fc2ed am: 21e70f4e18" into rvc-qpr-dev-plus-aosp
2020-07-24[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 ↵Xin Li
am: dedb01c972 am: 43bf3b8d1c -s ours am skip reason: Change-Id Ia93f243b01ddcbd23d5516552b2d492df18c0ade with SHA-1 b36625a2d2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I71a6e87f7fa5a2ec1dbef85f51aba4e6974529bd
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2ed am: ↵Xin Li
21e70f4e18 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I38c8800887897982be9262af3d22f7b4e97215c0
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2ed am: ↵Xin Li
c2b247d72e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I4bb66cdd17f24712fccc1fc3cdfd1a275d2df272
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2edandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: Ifcbae9348b4b946dee3f1c16eb7598273673c623
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: dedb01c972Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: Icfea3f68cef8641b394431048fbcd2f2ce176f4e
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2edXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I522763f8fbbf4fe4f47eefd67a25f9c67b88d071
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: Ife68d336b5f8c65f36daf8aa1d9521adb13d406f
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I3708f09645e266928f46259d3fb8aa961b733bd4
2020-07-24Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486 Change-Id: I956e8dacd7b52ad521f76df7798794724b7cff6d
2020-07-21Merge stage-aosp-rvc-ts-dev into rvc-devXin Li
Bug: 148878042 Merged-In: Ia93f243b01ddcbd23d5516552b2d492df18c0ade Change-Id: Ic77995b62407aab45c37a16b0325018ece082e18
2020-07-15Merge ab/12162526 into stage-aosp-rvc-ts-devandroid-cts-11.0_r2Xin Li
Bug: 148878042 Change-Id: Ia93f243b01ddcbd23d5516552b2d492df18c0ade
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 03:32:02 +0000