aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-081-0/+1
|\ | | | | | | | | | | Bug: 168057903 Merged-In: Ib6931e3695458d743667dff2d59acfd156415019 Change-Id: I6912598bd18f5a7ded5182aa767633de4a47b0f2
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-0/+1
|/| | | | | | | | | | | Bug: 166295507 Merged-In: I351000b81430c58bde24de7de6e401a18ef29f56 Change-Id: Ib6931e3695458d743667dff2d59acfd156415019
| * Relax org.skia.skqp.SkQPRunner#unitTest_CCPR_busyPath am: 25bec16283 am: ↵zhongjun.chen2020-06-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 6c0bc1cd9f Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1347403 Change-Id: I351000b81430c58bde24de7de6e401a18ef29f56
| * \ Remove tests that require large malloc allocations. am: e6618177daDerek Sollenberger2020-06-120-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/11852616 Change-Id: I65a137bef0c34e864193040cbacb82ed26512dbe
| | * | Remove tests that require large malloc allocations.android11-devDerek Sollenberger2020-06-122-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests are not adjusted to the memory capacity of the device and for devices with low memory requirements these tests can exceed the expected limitations and cause the app to crash. Test: this is a test Bug: b/158704814 Bug: b/149072884 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282622 Auto-Submit: Derek Sollenberger <djsollen@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>i Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282756 (cherry picked from commit fa8ed33ffe32be96303457e709f45a388ba80693) Change-Id: Ie9723c1a177e5a3b5b3ba785f5daa9ab745a74ad
| * | | Add dependency on jni_headers am: 1671be0cc2 am: e7114976e5Orion Hodson2020-06-011-0/+2
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ic77d9edb2042a59e95da8c8be2008949dffb3c4a
| * \ \ \ [automerger skipped] remove pointer tagging hack in SkRecord am: 6d7c94c1eb ↵Mike Klein2020-05-070-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am skip reason: Change-Id I1a78dd4e1b9b18dd02738bb1dfbbb968f29675bc with SHA-1 5d4e25e03b is in history Change-Id: Icd95a979dab7caf79b0b99bf355db80e28655f1e
| | * | | remove pointer tagging hack in SkRecordMike Klein2020-05-071-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This interferes with other uses of pointer tagging, like ARM pointer authentication or HSWASAN. (cherry picked from AOSP commit 5d4e25e03b4dcc5c16a253d593d896de9b993a65) Test: hwasan build of SkQPTestCases Bug: 155391001 Merged-In: I1a78dd4e1b9b18dd02738bb1dfbbb968f29675bc Change-Id: I1a78dd4e1b9b18dd02738bb1dfbbb968f29675bc -- SKIA Commit Details -- Reviewed-on: https://skia-review.googlesource.com/c/191286 (cherry picked from commit 740e5db7ab58708e64c1eaf19b7fd35eb2f1ad4e) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288158 (cherry picked from commit 0f3e31cee78a979e44572baa8414dc0f99c9e3f9) Change-Id: I8c296275a213362a8664adba225e84607e6c6cc5
| * | | | remove pointer tagging hack in SkRecord am: 5d4e25e03b am: fc08c72629Mike Klein2020-05-071-8/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I68abfed8162f622d62c2eb9c698c918966082576
| * \ \ \ \ Add METADATA to skqp: contains MPL=RECIPROCAL am: eec322052e am: 8225d25017Bob Badour2020-05-011-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I393b801be33a3313d3e515fa134388ad292a421a
| * \ \ \ \ \ Remove tests that require large malloc allocations. am: fa8ed33ffe am: ↵Derek Sollenberger2020-04-102-3/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab93d444bd Change-Id: I4195c79d8611c93947ab6af7b6fb49e8c318139a
| * \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: a1bb934ee8 -s ours am skip reason: subject contains skip directive Change-Id: I90b0ce4e430f44138528274ddda5ff893c95b258
| * \ \ \ \ \ \ \ [automerger skipped] Remove vts10 tests from vts suite am: 0199706ec8 -s oursDan Shi2020-04-060-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Ic03533eb4400808606af8946276314faedd2c8db with SHA-1 4e40e13dd0 is in history Change-Id: Ib161e33f658a31fdd421a43bf2f859794640c110
| | * | | | | | | Remove vts10 tests from vts suiteDan Shi2020-04-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests are only needed in vts10 suite, as they are part of CTS package and no longer needed in vts 11. Bug: 151896491 Test: local build Exempt-From-Owner-Approval: This CL removes vts10 tests from vts suite. It won't change test logic or behavior. Change-Id: Ic03533eb4400808606af8946276314faedd2c8db Merged-In: Ic03533eb4400808606af8946276314faedd2c8db
| * | | | | | | | Remove vts10 tests from vts suite am: 4e40e13dd0 am: 3d4d54b277Dan Shi2020-04-062-2/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3bffb661d5fc910187d2fdccd6e7ac4b760ce11
| * \ \ \ \ \ \ \ \ Add vts10 suite to existing vts tests am: 49231f6614 am: 6601bcf8e4Dan Shi2020-03-241-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice2bd6a13e3d9d2a631c8b28024bce29c0477539
| * \ \ \ \ \ \ \ \ \ Merge "Prune CtsSkQPTestCases out of general-tests." am: 24b2f8daf5 am: ↵Treehugger Robot2020-03-231-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcee72f7fd Change-Id: I0f7f4e8d188b54f4d8aa76ae4bee0111360e87e5
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2376d5432e -s ours am skip reason: subject contains skip directive Change-Id: I952c1e8260241a37c5a7c73c784798858c36cecc
| * \ \ \ \ \ \ \ \ \ \ \ Remove mips workarounds. am: 2ec7447d44 am: 60612e6d44Automerger Merge Worker2020-03-071-12/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70360698471f7e1c130863136fe948eeccf4ccac
| * | | | | | | | | | | | Merge "[skqp/release] Remove threshold for scale-pixels" am: a592de2f03 am: ↵Automerger Merge Worker2020-02-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e632e0a7c6 am: de24cae346 Change-Id: I723d7ff85d570765eb901b1c8cbe3b57d51251cd
| * \ \ \ \ \ \ \ \ \ \ \ \ Reland "Add small offset to t in GrLinearGradientLayout." am: 5540432b78 am: ↵Automerger Merge Worker2020-02-202-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4306b1d2ac am: 434b714f90 Change-Id: I20522e8d64edb48a8b643b2266e2c280fda048c8
| * | | | | | | | | | | | | | CtsSkQPTestCases secondary_userBookatz2020-01-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marks this CTS test module as supporting secondary_user, meaning that the tests are eligible to be run from a regular Android user other than the system user (i.e. other than user 0). Note that 'user' here refers to the concept of users in Android Multiuser; it is NOT the same as a uid. Bug: 141773058 Test: module passed with secondary_user params (--enable-optional-parameterization --module-parameter secondary_user) Change-Id: Id7132697b8cdb13fedcefcfe54c724af02d24b6c
| * | | | | | | | | | | | | | Replace -Weverything with -Wextra am: 29cd4eca88 am: 1308793d7cColin Cross2019-11-112-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0242a91d97 Change-Id: I270ffbf7c0adb0ebefdbeee7b00af9d8bbd0b015
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ SkQP: Relax largeglyphblur, linear_gradient, linear_gradient_nodither, ↵Hal Canary2019-11-041-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cliperror. am: 2879b2a6bf am: 7c79e45b9b am: 339d593267 Change-Id: Id4f726ec19febda606f5793e11ef9ba218650f03
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 90d353ad71 am: 91b77e5f7d -s ours am skip reason: subject contains skip directive Change-Id: I510e421a446f3003c77a9f4eabdc86faa5ddc8ff
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: d77aca23e0 am: bd19c88cc6Xin Li2019-10-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b996ad2f0 Change-Id: I4be6c2228b469e8359205a2b44963bfbe56b0769
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SkQP: relax colormatrix am: 24ed00a9a6 am: 795d6f64f9 am: 1a243dc1a9Hal Canary2019-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e38daf5f67 Change-Id: I217a4ce43b7dba3dd82c95ff4f1d81d456a6b5a6
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "SkQP: mark readpixels as a bad GM" am: 46717cc372 am: f71c34bc66 am: ↵Hal Canary2019-10-021-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bffaaffd33 am: b40ce8115d Change-Id: I306d528d286462b8ddd3c1ac01a7d8b3f6521ee0
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SkQP: relax colorfiltershader am: 315623602d am: 69f088d9d7 am: 85b6dbe3f6Hal Canary2019-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a03ebadff7 Change-Id: I6376b3720ee47e7ec34d8b6e4ca8b2045a75516a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 57f4cfa833 -s ours am: 4031654387 -s ours am: 4b122c34ca -s ours am skip reason: change_id I3d73bf43d8985be0683859900ce9ffec0eb7a27f with SHA1 c32eb4ca72 is in history Change-Id: I881ebe91bf46c2c936dbe5af7c751fb07659a852
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li2019-09-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c32eb4ca72 -s ours am: a02b10dc45 am: 468ab26316 am: d61d8067f9 -s ours am skip reason: subject contains skip directive Change-Id: Iaca780e762f8ee768ef66aa30a379a702aff7e1d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-08-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5713463) into stage-aosp-master am: 1d0b2c337f -s ours am: f7d358c2e0 am: 79d06e8583 am: 8270726d39 -s ours am skip reason: subject contains skip directive Change-Id: I411aacd69776deb0dc95c0b76a6499725a66cc1e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Adjust SkQP thresholds to accommodate SwiftShader. am: 9080e36257 am: ↵Stephen White2019-08-131-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e880b19d am: f0c124bd4c am: c6c07585ee am: c252e708ec Change-Id: I7ffe7fef252293d7f5a4270692c0bd46c06eba33
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SkQP: relax blurcircles2 am: 7c4db2b347 am: a91ee56e49 am: 6d8341acb0 am: ↵Hal Canary2019-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9d7dd8147 am: 344d5065f9 Change-Id: I1ed195af119b2b35a0cee222d62a6e22374a12d9
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Convert CtsSkQPTestCases to Android.bp am: 247a0c7ee2 am: ea263d122e am: ↵Colin Cross2019-07-222-18/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 587430cc78 am: f9acddeaeb Change-Id: I9a0ee352c472bd69ca9b0a3ca785093962d257e3
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: fe8bec1ee1 -s ours am: 2afb02b41e am: 5d8df6f9ec -s ours am skip reason: subject contains skip directive Change-Id: If4e12870c13761848fb0f8c8308405234e6b10bf
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SkQP: fix Filterable.filter am: c0b8bf2b74 am: 172d9d067a am: 66b4348e7dHal Canary2019-06-261-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c32fc69167 Change-Id: I21177717f5e952b33e65d2493cbc7103dfe4be92
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Mark CtsSkQPTestCases as non-shardable am: a8cc842725 am: acc973735c" ↵Julien Desprez2019-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-r1-dev-plus-aosp am: 71b98cb845 Change-Id: I60b9fb992578a1066b7a84b256e65ec5a5e41f4d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Mark CtsSkQPTestCases as non-shardable am: a8cc842725 am: 0bf9256bb3Julien Desprez2019-06-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 169bbc0313 Change-Id: I84498901ed107947296207031caaf9e991b3366c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix VkhardwareBufferTest to check for egl native fence extension. am: ↵Greg Daniel2019-06-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88e24b4d35 am: 48e5c9e4ab am: 8bf364a055 am: 48057b5ea9 am: 803951b8ed Change-Id: Id0ee3fcb2b64fbebb2ff28674bd116b58827c8b8
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix VkhardwareBufferTest to check for egl native fence extension. am: ↵Greg Daniel2019-05-301-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13c0a68e37 am: 6d3112e1d1 am: 484bb2d418 am: 3429c1ba91 Change-Id: I93ca34e4d0ceacb9bdf1fc56889bcc031fe47211
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix compatible format check for vkCmdCopyImage. am: 885be039ca am: ↵Greg Daniel2019-05-232-4/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d50ffe43a am: 74ec10c486 am: d4abaee39a Change-Id: Ie7217dbf99eed7a65c8c7e9027cc368bbd7b32bf
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "SkQP: relax textbloblooper test - DO NOT MERGE" ↵Hal Canary2019-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pie-cts-dev am: 29ef575256 -s ours am: 516750248c -s ours am: 4056091f73 -s ours am: f5c0f45aa1 am: 939d2882c5 -s ours am skip reason: subject contains skip directive Change-Id: I052fd395ee8b89d6f55945e559d9476c238619d4
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] SkQP: remove unreliable tests DO NOT MERGE am: ↵Gurchetan Singh2019-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b5c5afd0d -s ours am: 71350a7ad1 -s ours am: bee1ad3317 -s ours am: 0f4df5ee11 -s ours am skip reason: subject contains skip directive Change-Id: I10ca77b62a97bb84a7c7a0617a7bfd86f0b4c905
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add android:exported values to all SkQP activities. am: 4a4c793f12Derek Sollenberger2020-08-181-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1402753 Change-Id: I948335e485a2354fd4960debd0f3f8c04316e48f
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add android:exported values to all SkQP activities.Derek Sollenberger2020-08-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax org.skia.skqp.SkQPRunner#unitTest_CCPR_busyPath am: 25bec16283zhongjun.chen2020-06-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1347403 Change-Id: I13fe85df869b018ceed60d39aa563026f248ed34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax org.skia.skqp.SkQPRunner#unitTest_CCPR_busyPathandroid-r-beta-3android-r-beta-2zhongjun.chen2020-06-231-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decreasing the kNumBusyVerbs count in CCPRRenderingTest function,for the DDR(512M) is so weak that the phone cannot afford this testcase. Test: passed this test Bug: 156326016 Change-Id:I80a2611cb597157a4909544dbc14591e38cd7065
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency on jni_headers am: 1671be0cc2Orion Hodson2020-06-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80a2611cb597157a4909544dbc14591e38cd7065
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency on jni_headersOrion Hodson2020-05-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation for removing implicit include paths for jni.h from soong. Bug: 152482542 Test: m checkbuild Change-Id: I8351cf0169127f3273e48e855a31df68a4c04dba Merged-In: I8351cf0169127f3273e48e855a31df68a4c04dba Exempt-From-Owner-Approval: build clean-up (cherry picked from commit 9045726ed4cc7c14d1c1ca8341da931fb86bae51)