aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-29Snap for 8782634 from f16c0c2c42006f03341601188e7319bbe25dd426 to sdk-releaseplatform-tools-33.0.3sdk-releaseAndroid Build Coastguard Worker
Change-Id: I7ff9e34498c3bf6ceb9b951712a9dece8e880d0a
2022-05-08Snap for 8554636 from 5fdf3aa7b035bb8016a0a30bba71071ef4cd3372 to sdk-releaseplatform-tools-33.0.2Android Build Coastguard Worker
Change-Id: Id101635070f26a44b37d844feed3ce1b44bb55b2
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 654a98ef89 -s ours am: ↵HEADmastermainMaria Yang
5fdf3aa7b0 -s ours am: 4c088010b1 -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/2037264 Change-Id: Ie3311eb47b3cbf40b5a09478f4634fdae34740e9
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 654a98ef89 -s ours am: ↵Maria Yang
5fdf3aa7b0 -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/2037264 Change-Id: I197ee11a1629bfbff543f1674367ab3aa3464ae5
2022-03-22[automerger skipped] Mark ab/8191998 as merged am: 654a98ef89 -s oursMaria Yang
am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/2037264 Change-Id: I2ed5faa8937bb4493ab983e18449d318a4d633c7
2022-03-21Mark ab/8191998 as mergedandroid-vts-12.1_r3android-vts-12.1_r2android-cts-12.1_r3android-cts-12.1_r2Maria Yang
Bug: 188847863 Merged-In: Ie21d558275f6d7580a9963d72d5cba92ed30b962 Change-Id: I836cd48863541a6fdc95416aac71b33c80c60382
2021-12-23Snap for 8023979 from 94ed3ab33dd02c4f212ab514ddcb59810b2c5a4a to sdk-releaseplatform-tools-33.0.1platform-tools-33.0.0Android Build Coastguard Worker
Change-Id: Ie98975b288599fca79665a2fda2be30b3e77e732
2021-12-16[BACKPORT] Fix -Wstring-concatenation warnings in clang 12 am: 94ed3ab33d ↵Brian Salomon
am: b583dd232f am: 537f5dea6f Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1924038 Change-Id: If4859dfc68d109b699f8cfc42ec2e5b0c7ec301f
2021-12-16[BACKPORT] Fix -Wstring-concatenation warnings in clang 12 am: 94ed3ab33d ↵Brian Salomon
am: b583dd232f Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1924038 Change-Id: Id81c325c1905db48944b0a1722651991cc6dfd13
2021-12-16[BACKPORT] Fix -Wstring-concatenation warnings in clang 12 am: 94ed3ab33dBrian Salomon
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1924038 Change-Id: I7d1633b440262d97bebb06ce7f7dc4436733491a
2021-12-16[BACKPORT] Fix -Wstring-concatenation warnings in clang 12android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Brian Salomon
Change-Id: Ic09346b6079e6f316c28e03ddb02f12b4af8a38d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/312482 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2021-12-16Snap for 8005954 from 81c069525ee8c577ddd32990837584a3341ee737 to sdk-releaseplatform-tools-32.0.0Android Build Coastguard Worker
Change-Id: If8dbf5e70912579e82eb954fba414334660978e5
2021-10-14Snap for 7821744 from 768de9eca6ae6a8012c8536c8af1b2a300b47a3f to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I7fe32487be37c5850d5f48178eec9604375cabd5
2021-10-09Relax org.skia.skqp.SkQPRunner#unitTest_CCPR_busyPath am: 317648fc99 am: ↵zhongjun.chen
94e970fb98 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1347404 Change-Id: I04fe03b6ccd02617532af366890bd9f1bbf1db0d
2021-10-09Merge "SkQP: fix Filterable.filter" into android10-tests-dev am: eef3f22ed8 ↵Ross Yeh
am: 255439f258 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1137096 Change-Id: Ia3ae26d96146d69d512bbc3ab49b5d0e3a4d4435
2021-10-09Remove tests that require large malloc allocations. am: 9a904fc51c am: ↵Derek Sollenberger
9e1d11e92b Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1284062 Change-Id: Iedfe45af628fafb54dafd43a0bf57551e792b038
2021-10-09[skqp/release] Remove threshold for scale-pixels am: fbc65ee5ff am: 76fb521d37Tyler Denniston
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1242660 Change-Id: I214bc238f558ebfa4ef520d3508ec5ad5c1e06bb
2021-10-09Merge "SkQP: relax colormatrix" into android10-tests-dev am: 199747d217 am: ↵Treehugger Robot
5e4bec0138 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1147976 Change-Id: I096c553f608baac988aeca7c165e927ca63b7aa4
2021-10-09SkQP: Relax largeglyphblur, linear_gradient, linear_gradient_nodither, ↵Hal Canary
cliperror. am: 2d571d0a27 am: d61c7ed231 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1157534 Change-Id: I4e1241a24060b590d2ef53331980e30a3bc13605
2021-10-09SkQP: mark readpixels as a bad GM am: 621fbe920f am: 94515b8427Hal Canary
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1147654 Change-Id: I23f48b28dce2dfb47e5158176a7d51243fc664ba
2021-10-08Merge "SkQP: relax blurcircles2" into android10-tests-dev am: 47ae8fa681 am: ↵Treehugger Robot
7d123c21a8 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1137675 Change-Id: I7ba56c224d78d4186f8b285ddf7abae6e5be2d22
2021-10-08[automerger skipped] SkQP: relax colorfiltershader am: a1b1061530 -s ours ↵Hal Canary
am: 4fea90f152 -s ours am skip reason: skipped by user rossyeh Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1137416 Change-Id: I78360a8eb19218ebeb38cd3dd2d396d77b1ed204
2021-10-08[automerger skipped] Merge Android 12 am: 768de9eca6 -s ours am: 6075def434 ↵Xin Li
-s ours am: 1320dfd706 -s ours am: 81c069525e -s ours am skip reason: Merged-In I6c74f839d52db5c68812229a08b585ad416d5fed with SHA-1 312bd5a697 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1847319 Change-Id: I4dd3662bc7df685419db73ce72309081521f4ece
2021-10-08[automerger skipped] Merge Android 12 am: 768de9eca6 -s ours am: 6075def434 ↵temp_sam_210511427Xin Li
-s ours am: 1320dfd706 -s ours am skip reason: Merged-In I6c74f839d52db5c68812229a08b585ad416d5fed with SHA-1 312bd5a697 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1847319 Change-Id: I472dd8e608eafa344da1b52380eae573e642082a
2021-10-08[automerger skipped] Merge Android 12 am: 768de9eca6 -s ours am: 6075def434 ↵Xin Li
-s ours am skip reason: Merged-In I6c74f839d52db5c68812229a08b585ad416d5fed with SHA-1 312bd5a697 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1847319 Change-Id: I5d61cdc2582e48948e02175db3e99321716b4b30
2021-10-08[automerger skipped] Merge Android 12 am: 768de9eca6 -s oursXin Li
am skip reason: Merged-In I6c74f839d52db5c68812229a08b585ad416d5fed with SHA-1 312bd5a697 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1847319 Change-Id: I41a4561e7f6bf419107fbbdfdfded548aa274258
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I6c74f839d52db5c68812229a08b585ad416d5fed Change-Id: I73dcd6fa78340f83324fdec050a137ef7007f069
2021-09-02Snap for 7696017 from 6def82cb80e2e922a32ce92ee93643bdb7e45f5e to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Id7f01c395e2100000b644004c840e1c1ed400682
2021-08-31Stop using `group_static_libs` property am: 6def82cb80 am: 312bd5a697 am: ↵LaMont Jones
78b096bf0d am: 372e8aed03 Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1814296 Change-Id: I4301e47d70ea3678deccf6eb5703c06a58c3e0d6
2021-08-31Stop using `group_static_libs` property am: 6def82cb80 am: 312bd5a697 am: ↵LaMont Jones
78b096bf0d Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1814296 Change-Id: I538e9584b08f9c01763c3092d0d9db4f8f04ecfe
2021-08-31Stop using `group_static_libs` property am: 6def82cb80 am: 312bd5a697LaMont Jones
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1814296 Change-Id: I0505a67703d7b2d1fc7d7692c3165b1a2ecbbca9
2021-08-31Stop using `group_static_libs` property am: 6def82cb80temp_sam_202323961LaMont Jones
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1814296 Change-Id: I6c74f839d52db5c68812229a08b585ad416d5fed
2021-08-30Stop using `group_static_libs` propertyandroid-s-beta-5android-s-beta-5LaMont Jones
This property is now ignored, so there is no need to set it. For more details, see the bug and/or "Effecient archive file handling" in https://lld.llvm.org/NewLLD.html#key-concepts Bug: 189475744 Test: Manual build succeeds Change-Id: I411cfaf6d54b2c728b1cd073a2f588ab9aa89843
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
68a6fe6c82 -s ours am: cc857a2db5 -s ours am: 4b47250c8d -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/15571787 Change-Id: I15140c0f7a4c1a3b2f4b453dc43fe9456a76fc1c
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
68a6fe6c82 -s ours am: cc857a2db5 -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/15571787 Change-Id: I1a9ea8f1974118231ff2c5f01509211879088a8a
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
68a6fe6c82 -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/15571787 Change-Id: I758dd784dbcec90ee39a6d707d01a0deec2bdf08
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: Ie21d558275f6d7580a9963d72d5cba92ed30b962 Change-Id: Idfc0cf1eef011951806ff34b84f09b974203b024
2021-03-04Snap for 7183507 from 71ee2251f4964d413dfc51564bc3d54d67ac8a95 to sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1android-build-prod (mdb)
Change-Id: Iccecc0c4e7ee2a84d876fd8f5b27593c96764f1f
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
2021-01-29Snap for 7110675 from 06dac175f1c1e23fe984cacb3f17e5c7a5e5e536 to sdk-releaseplatform-tools-31.0.0android-build-prod (mdb)
Change-Id: If8d989be78d1f0ca41c3d52fc5b916e44d66948e
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 09:01:29 +0000