summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-14Snap for 11219529 from a88d8919b87b12c1dbecdcad6407b50d3c46c720 to ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010Android Build Coastguard Worker
mainline-tzdata4-release Change-Id: I9344044d27fee445e700e89424c76bd50fda62ab
2023-06-12Merge "Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev am: e8a7be73b3" into android13-tests-dev am: c5db4be612 am: bcf5ca7156 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312 Change-Id: Ib14f141493efc5c0b7d9b499b14fe614cd27136d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12Merge "Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev am: e8a7be73b3" into android13-tests-dev am: c5db4be612 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312 Change-Id: Iddcb416a31798e99ddcf351d56267e79f8bf7535 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12Merge "Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev am: e8a7be73b3" into android13-tests-dev
2023-06-12Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev am: e8a7be73b3 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312 Change-Id: Id145449ae7ee768c3a443c9dd26f6f1a77f906f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12Merge "Merge "resolve merge conflicts of ↵Automerger Merge Worker
86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev" into android12-tests-dev am: e89e097679" into android12L-tests-dev
2023-06-12Merge "resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac ↵Treehugger Robot
to android12-tests-dev" into android12-tests-dev am: e89e097679 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2621312 Change-Id: I9bacb4ff2ce7fcd4fde62c85d13b8955082532ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12Merge "resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac ↵Treehugger Robot
to android12-tests-dev" into android12-tests-dev
2023-06-09resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac to ↵Yabin Cui
android12-tests-dev Bug: 286585422 Test: build Change-Id: I4ca69cbfde11d05152a010f30b22acbac5fbbf0a
2023-06-09Merge "simpleperf: Check hardware counter dynamically in non-native ABIs" ↵android11-tests-devTreehugger Robot
into android11-tests-dev
2023-06-08simpleperf: Check hardware counter dynamically in non-native ABIsYabin Cui
ARM64 CtsSimpleperfTestCases may run via binary translation on a x86_64 environment, which may run on a VM not supporting hardware counters. Bug: 284801306 Test: run CtsSimpleperfTestCases Change-Id: Icc08d3639459c2c671f57c96860db085e8b7f8b9
2023-06-03Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into ↵Automerger Merge Worker
android13-tests-dev am: bac4d2b7a7 am: 12aef7ca50 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Iedd591f9b4b342f4faf8e016e272944b90a87f1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am: 01a4d41297 -s ours am: a7c7e52fcf -s ours am: 883f3cdb6c -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Iaa39d8f21fc684683fc27ef8013b276195a84881 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into ↵Automerger Merge Worker
android13-tests-dev am: bac4d2b7a7 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Ifb12499d5390e40f9e9a4b170e17568d944e1300 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am: 01a4d41297 -s ours am: a7c7e52fcf -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: I5afd785a0e8a0112f59bd0a432388d434fd875f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into ↵Automerger Merge Worker
android13-tests-dev * changes: Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into android12L-tests-dev am: 04747534f8 [automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am: 01a4d41297 -s ours
2023-06-03Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into ↵Automerger Merge Worker
android12L-tests-dev am: 04747534f8 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: I700bc244cf2d53253f01a42ff030bbb7fd613ca6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am: 01a4d41297 -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Ifd83e764570fb0ef457b4084ec38680f5b48ff6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev am: 74954de15a [automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours
2023-06-02Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Automerger Merge Worker
runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev am: 74954de15a Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Ifce085da936be76bdbb8dccb697ff6397922bc4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: Idd24fca32d5cd218ce1a1dcc3e755a71849c5969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Automerger Merge Worker
runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev
2023-06-02[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with ↵Treehugger Robot
runtime check." into android11-tests-dev am: c039b5cf02 -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381 Change-Id: I18c5e886e64ce79573ce4507ecfa03f9939ee921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02Merge "simpleperf: replace InCloudAndroid() with runtime check." into ↵Treehugger Robot
android11-tests-dev
2023-06-02simpleperf: replace InCloudAndroid() with runtime check.Yabin Cui
On x86 and x86_64, it's likely to run on an emulator or vm without hardware perf counters. It's hard to enumerate them all. So check if hardware perf counters are available at runtime. Bug: 284801306 Test: run simpleperf_unit_test Change-Id: I38cc89bc7f81f8d6d6165a4b8f344c0660c10364 (cherry picked from commit 1f6f51aee77235b1fb374a917f0b46c9c09f0933)
2023-05-31Merge "Merge "Merge "Merge "arc: Fix CTS tests for grunt" into ↵Automerger Merge Worker
android11-tests-dev am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev am: 66f20d311e" into android13-tests-dev am: 7650777c5f am: 46f24d4cdb Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I71d1d208ab5d3744cf19c5d82e0c5493e53abcb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "Merge "Merge "Merge "arc: Fix CTS tests for grunt" into ↵Automerger Merge Worker
android11-tests-dev am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev am: 66f20d311e" into android13-tests-dev am: 7650777c5f Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I26f88deb4e0a39d3f6a1d265e85154ec5ddb1ba2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "Merge "Merge "Merge "arc: Fix CTS tests for grunt" into ↵Automerger Merge Worker
android11-tests-dev am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev am: 66f20d311e" into android13-tests-dev
2023-05-31Merge "Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev ↵Automerger Merge Worker
am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev am: 66f20d311e Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I2c023dc12ad29e623718b6d79927de0a036bb8eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev ↵Automerger Merge Worker
am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev
2023-05-31Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: ↵Automerger Merge Worker
b19afd3d01" into android12-tests-dev am: 886dfe2c36 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I0769507ba3a26ea94be4639cec2b01bd09737aa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: ↵Automerger Merge Worker
b19afd3d01" into android12-tests-dev
2023-05-31Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: b19afd3d01Yury Khmel
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270 Change-Id: I483c661e5783de8f775ad509829f912302347aac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Merge "arc: Fix CTS tests for grunt" into android11-tests-devYury Khmel
2023-05-29arc: Fix CTS tests for gruntYury Khmel
Waiting loop has 1us delay waiting for requested changes are propagated. This is too aggressive and Grunt and other low-end devices may have no chance to react in specific timeout. Bug: 265675811 Test: cts-tradefed run commandAndExit cts -m CtsSimpleperfTestCases Most tests are now passing: Total Tests : 540 PASSED : 528 FAILED : 12 Change-Id: Ida041674c2fea425e6d267ee6a973208da00ed71
2023-05-10Snap for 10102166 from bfe2d06be19a7f1e80b9487549348f950fee6903 to ↵aml_tz4_331910000android13-mainline-tzdata4-releaseAndroid Build Coastguard Worker
mainline-tzdata4-release Change-Id: I6430a252a6697f8139b9746befc412588269d6a3
2023-01-25Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0 am: d766f83731 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Idf0f946c4ec12f446398c803cc267316533019be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours am: e371085cdc -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Ic8f248096fcc725d9eb6f8199cc5017451851591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I8f7f4ca62445c222e25333e566949060db08cb67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I6b2bf53a1da0e672446e75101d0681670e18585c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Snap tm-dev to android13-tests-dev am: e65f708054Samip Garg
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/20514526 Merged-In: Ib4c566b0bd0e5c761d9c78620caa13703c10589c Change-Id: I1f95ab13b613eb7c56163fe7f0dc2bf19ea9e4aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Snap tm-dev to android13-tests-devSamip Garg
Bug:259849956 Merge ab/9299233 Merged-In: Ib4c566b0bd0e5c761d9c78620caa13703c10589c Change-Id: If320111be77cb6d02307b8442148140a0c494169
2022-12-01Merge "[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev
2022-12-01[automerger skipped] Merge "Merge "simpleperf: fix ↵Automerger Merge Worker
check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am skip reason: skipped by user yabinc Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: Ia5c9bd2a9a39fc074911473337953de650cdce24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." ↵Automerger Merge Worker
into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev
2022-12-01Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into ↵Treehugger Robot
android12-tests-dev am: 8aff5ada38 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I27131a851f65bd95cb5fb548a160540877d42b30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into ↵Treehugger Robot
android12-tests-dev
2022-11-30simpleperf: fix check_trampoline_after_art_jni_methods test.Yabin Cui
Loose the test and IsArtEntry() function to allow using art_quick_generic_jni_trampoline. (cherry picked from commit 41677a6ed702e6394912af43483b5b785562a79b) Bug: 260538122 Test: run simpleperf_unit_test Change-Id: Ia554c4186ce804601138160e1320421ee7ede3d0
2022-09-15Merge "Merge "simpleperf: assume gpc targets as emulator" into ↵Automerger Merge Worker
android12L-tests-dev am: 942b61f7cf" into android13-tests-dev
2022-09-15Merge "simpleperf: assume gpc targets as emulator" into android12L-tests-dev ↵Shubhangi Pawar
am: 942b61f7cf Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2216082 Change-Id: I279cb25b42ff4b57fa1fe623a68b97c1ed42cd66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 19:43:43 +0000