aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-09Snap for 9712464 from 91ba37be107e1fdefc2bb2ab9a34b36910e0bfd2 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseAndroid Build Coastguard Worker
Change-Id: Id41116d92672bc427e880b5858551c6919a34633
2023-03-08Snap for 9705326 from c2f359b2335f3f3b6b8cca59b2e83de3ca4b64e8 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I12c37535a3d6891b8e7409c440ec0848dfd47d2f
2023-03-07Revert "Revert "Revert "Fix device death tests.""" am: 42795cf170 am: ↵android14-devDiego Vela
276e32ec33 am: 817e9f6edc Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2475384 Change-Id: I5941a1c6769b57475da554f5b3e49f28f566863f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Revert "Revert "Revert "Fix device death tests.""" am: 42795cf170 am: 276e32ec33emu-33-devDiego Vela
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2475384 Change-Id: I93c1bd0538c18e2abd5b279ac59e48a6105abe64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Revert "Revert "Revert "Fix device death tests.""" am: 42795cf170ndk-r26dndk-r26cndk-r26bndk-r26-rc1ndk-r26-beta1ndk-r26android-u-beta-1-gplndk-r26-releaseDiego Vela
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2475384 Change-Id: Iedbc9c064d071696329ae42e19bc0c112891bf90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Revert "Revert "Revert "Fix device death tests."""Diego Vela
This reverts commit 479381ccf23eb868b4793f196ff153e00f105e39. Reason for revert: Causing test failures. https://android-build.googleplex.com/builds/tests/view?invocationId=I43600010138010586&testResultId=TR77428536100414300 Bug: 272089599 Change-Id: I6822f857606fa6c82452580747cd77aa0f36da40
2023-03-07Revert "Revert "Fix device death tests."" am: 479381ccf2 am: b946fde85b am: ↵Krzysztof Kosiński
b0ac539bbe Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2472685 Change-Id: I308e212e688692eb21db84847ad7f3699d83bb70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Revert "Revert "Fix device death tests."" am: 479381ccf2 am: b946fde85bKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2472685 Change-Id: I61496be88f25db27381c8e6a5bcc8b56a3b19dc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Revert "Revert "Fix device death tests."" am: 479381ccf2Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2472685 Change-Id: Ib0a6721c00983b6a62e1854c14b23e0b4502867a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06Revert "Revert "Fix device death tests.""Krzysztof Kosiński
This reverts commit c4ccb3b18f191b96a401465777ebfd224705b26e. Reason for revert: The tests broken by this change should be fixed now. Bug: 270535879 Test: presubmit Change-Id: Icc629db4eeb7b176a3495c2b3f50c2bc96374cba
2023-03-05Snap for 9690662 from 88427d8639e294eeef6f8010830bc172355ea154 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I176eb2db412fbbcd95a40a09a3fae58250a3b0b8
2023-03-03Revert "Fix device death tests." am: c4ccb3b18f am: a12e0bc627 am: 315cfd470bKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2468960 Change-Id: Iee7ec222ad97a3753f8abb08623c9fa9086d3a8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Fix device death tests. am: 68218f1fd8 am: 08a191a6bd am: 8fb46995d3Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2459968 Change-Id: I1d1482cae1a700e727d75b19a0e7e81ada0d4fb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Revert "Fix device death tests." am: c4ccb3b18f am: a12e0bc627Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2468960 Change-Id: I7dabcf6cc188e36fdc5ff67df0e203c9700e01de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Fix device death tests. am: 68218f1fd8 am: 08a191a6bdKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2459968 Change-Id: I5e17f9075dd3b5e903beef86cb79d839959f176c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Revert "Fix device death tests." am: c4ccb3b18fKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2468960 Change-Id: I0fb3d870ca78b685a80a15d9877b2d271a8ecfff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Revert "Fix device death tests."Krzysztof Kosiński
This reverts commit 68218f1fd8047664df8d2e2c54497e41bf12b537. Reason for revert: interferes with apexd_test Bug: 271504595 Change-Id: I6f0bbd97f790a50acee12e69af8b439f89c05ac1
2023-03-03Fix device death tests. am: 68218f1fd8Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2459968 Change-Id: I6907c6e8f558f560440ac17c211995fc9ee6fcf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Fix device death tests.Krzysztof Kosiński
The death message is usually reported using LOG(FATAL) or CHECK(). In device tests, these messages are reported to logd instead of standard error and cannot be seen by GTest. Add a custom test init function which adds a logger that repeats the message to stderr if we are in a death test child process. Bug: 270535879 Test: presubmit, ran the test from the bug Change-Id: Ibd23031260d3e75f634af6d434bbf010b277803b
2022-06-16Snap for 8730731 from bb371ac572ab6a53b429374890b10f37416ee999 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I443d8f27cd7eb39ed6751f05dacb567aea5c55f2
2022-06-14Build gmock with exception tables. am: 18a21d8f68 am: 5979ba80cc am: ↵Florian Mayer
a8b15f0226 am: 6f2cbe1d19 am: 525b72a0dc Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2115554 Change-Id: I2d1dd53d4881142c3c12dfc05396a936c078b936 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Build gmock with exception tables. am: 18a21d8f68 am: 5979ba80cc am: ↵main-16k-with-phonesandroid-games-sdk-games-performance-tuner-releaseandroid-games-sdk-games-controller-releaseFlorian Mayer
a8b15f0226 am: 6f2cbe1d19 Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2115554 Change-Id: Ib883917385bae6352d867b9148ac993404c629bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Build gmock with exception tables. am: 18a21d8f68 am: 5979ba80cc am: a8b15f0226Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2115554 Change-Id: I56335ad007e8e21568c65a07cb446e870273eb44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Build gmock with exception tables. am: 18a21d8f68 am: 5979ba80ccmain-16kFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2115554 Change-Id: Icaf7f9a81b22eb9eb994ca6877ec9a07ee8a4a7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Build gmock with exception tables. am: 18a21d8f68emu-32-devFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2115554 Change-Id: I01708c5e1c155515c5afa8f0eb939cf8a8ad00c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Build gmock with exception tables.Florian Mayer
Bug: 233683072 Change-Id: Ic208fc03670a8c9b4ceb7dc805d45cd25e69be8c
2022-05-07Snap for 8555136 from 7284217f20a543fcb142e23b4dff453f6f3defb6 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Iec8dba04254bc325350888779498d86c4cfa0b96
2022-05-06Changes to gmock to support isolated as default am: 95298b0af8 am: ↵Trevor Radcliffe
a2ccc04fb9 am: c806a48b7b am: 835e9c7ba7 am: b2486ebde7 Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2069567 Change-Id: I4ff83f760507f84f42cca4edcd72568b8eb2ce09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Changes to gmock to support isolated as default am: 95298b0af8 am: ↵Trevor Radcliffe
a2ccc04fb9 am: c806a48b7b am: 835e9c7ba7 Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2069567 Change-Id: Iebbab6bc9f7008c75af7e3ca927f7a898fd43bc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Changes to gmock to support isolated as default am: 95298b0af8 am: ↵Trevor Radcliffe
a2ccc04fb9 am: c806a48b7b Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2069567 Change-Id: I8b2aeed4c86d63dfde240db5005ca8662bb93fd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Changes to gmock to support isolated as default am: 95298b0af8 am: a2ccc04fb9Trevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2069567 Change-Id: I339884881f3f0914d0f194188ef077fb2d15fc57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Changes to gmock to support isolated as default am: 95298b0af8Trevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2069567 Change-Id: I7eb479ddf6db6c1b4d4d9b29d7da322eba63abf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Changes to gmock to support isolated as defaultTrevor Radcliffe
gmock bp module needed to be changed in order to support the change to using isolated as the default for cc_tests Bug: 178498003 Test: m nothing Change-Id: I44e4c85f5fb033f821c72cda37b09ac592fe0c27
2022-03-25Snap for 8355292 from 4c0d0ac074bb67ff451983b598a2c99a9e589c09 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Id7f80bfdfcbd060a9f54875805174205bac87c54
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598 am: b1124a70c1 am: ↵Florian Mayer
c095bdd1be am: 1840bde20b am: 31d04b416a Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: I93de11ac5c4141295a28bc91263ff1ccf5828ad0
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598 am: b1124a70c1 am: ↵Florian Mayer
c095bdd1be am: 1840bde20b Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: Ifd07808bed874170e499ef8f807dfb1010e76ac2
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598 am: b1124a70c1 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Florian Mayer
c095bdd1be am: 1840bde20b Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: I23724866a484030c93d8eee758b6721d83d57b18
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598 am: b1124a70c1 am: c095bdd1bet_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: I8f39888a0288bfa445116d0ad46bf160e832cda5
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598 am: b1124a70c1Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: I12d23d4e8be858331bb2dec403cdd55fd6016a79
2022-03-24Add googletest to hwasan-postsubmit am: 89d985b598Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2041067 Change-Id: Ic9575965244343155e88a1eabde329686d0a3cdc
2022-03-23Add googletest to hwasan-postsubmitFlorian Mayer
Test: Run tests under HWASan. Bug: 193568145 Change-Id: I3e94dc67f533d63b5659c6d073da586f82ebcfb3
2021-11-10Remove 'sanitize: none' from gmock. am: 943df21dfc am: 2c80bd2116 am: ↵Mitch Phillips
c83a2010a3 am: 0f8edbebf6 am: 7674c148dc Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1886259 Change-Id: I6e01c29a46d835460718509d64e821fa51e0246d
2021-11-10Remove 'sanitize: none' from gmock. am: 943df21dfc am: 2c80bd2116 am: ↵Mitch Phillips
c83a2010a3 am: 0f8edbebf6 Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1886259 Change-Id: I087c6147dddc57f81a69f1809ee3d975faeb28e4
2021-11-10Remove 'sanitize: none' from gmock. am: 943df21dfc am: 2c80bd2116 am: c83a2010a3Mitch Phillips
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1886259 Change-Id: Iecb6026919e07f10f5bc69c0a59ecfd53bb19f46
2021-11-10Remove 'sanitize: none' from gmock. am: 943df21dfc am: 2c80bd2116Mitch Phillips
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1886259 Change-Id: I77cb5c7eb8836bd89e8db7b0cab7f0a3c030575a
2021-11-10Remove 'sanitize: none' from gmock. am: 943df21dfcndk-r25-beta2ndk-r25-beta1android-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-1Mitch Phillips
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1886259 Change-Id: I12fa951d2712b75d6fe93af154657b5ecd2afe81
2021-11-09Remove 'sanitize: none' from gmock.Mitch Phillips
This seems like an unnecessary flag, merged over from the AndroidMK -> Soong transition. Bug: 204857847 Test: SANITIZE_TARGET=hwaddress m gmock Change-Id: I0c30735e10546a42bcccdf49ddcfde414fd6cc37
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: 0a1c7cd47e am: b152a5e68a -s ours am: a8afeee174 -s ours am skip reason: Merged-In I8aab5faf3b341bed5dcdfe3ef93e49d3dc1157d1 with SHA-1 cfe1ebd4ff is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/googletest/+/15167754 Change-Id: Id31ad581ff700ee752dba8bae456f0b50e2f9c76
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: 0a1c7cd47e -s ours am: 6b81b8eed5 -s ours am: 060c71d2a1 -s ours am skip reason: Merged-In I8aab5faf3b341bed5dcdfe3ef93e49d3dc1157d1 with SHA-1 cfe1ebd4ff is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/googletest/+/15167754 Change-Id: I72ab42abe36f5295709beb0a49cf7f963adeb59a
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: 0a1c7cd47e am: b152a5e68a -s ours am skip reason: Merged-In I8aab5faf3b341bed5dcdfe3ef93e49d3dc1157d1 with SHA-1 cfe1ebd4ff is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/googletest/+/15070331 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/googletest/+/15167754 Change-Id: I72661db4f00f353e19ce5474769a0e1f47d6095c