summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py"Treehugger Robot
2022-04-13Fix issue with python3 conversion of build_verity_metadata.pyCole Faust
Files should be opened for reading/writing in text mode, not binary mode. Bug: 203436762 Test: Presubmits Change-Id: I86166bf434704dbd0a546e543c684818b57620f5
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: ↵Cole Faust
a6c30f6aa9 am: 88c5339b43 am: a016c0eb41 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I4ddc5b8260257890d973ee541a55f2e999b7e2a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: ↵Cole Faust
a6c30f6aa9 am: 88c5339b43 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I6a9e6b10ac1c872229cef2ee8a513ac372f3ad07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: a6c30f6aa9Cole Faust
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I1930154d81a8e7abbf41959c5d15c0e0c49c14b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21edCole Faust
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I3c2f5cde8e38d5f808f227104761b926f62312d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3"Cole Faust
2022-04-05Convert build_verify_metadata to python 3Cole Faust
Also update some python 3 issues in mkuserimg_mke2fs. Bug: 203436762 Test: Presubmits Change-Id: Ib919d40c96d3c26d29d8c1b4af67300c4130ec42
2022-04-03[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into ↵TreeHugger Robot
stage-aosp-master am: f9c71eed93 -s ours am: 10a5c3a58e -s ours am: 043416d243 -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I4bd5fe159e105379c1ba78a2457b0238ce599b73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s ours ↵Xin Li
am: 35bc61390e -s ours am: 845fa1fb59 -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I26a668c226001bb1bf0abdfe208212c5a45877a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into ↵TreeHugger Robot
stage-aosp-master am: f9c71eed93 -s ours am: 10a5c3a58e -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: Ia43fabcbc95d6c7b030ca3c0e4afbb145f5a9328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s ours ↵Xin Li
am: 35bc61390e -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I425fc82c98c8a986c7350d7d75dc66d1a39c8c3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into ↵TreeHugger Robot
stage-aosp-master am: f9c71eed93 -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: Id94eb0d07e5a0a18c21cc9777c104b879cd8b47c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s oursXin Li
am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I737a928ed50fbcf42e1e91d4e83b969e3a4e5cba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-masterTreeHugger Robot
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 ↵Yabin Cui
am: c675d90a82 am: bb5e926ee8 am: 56985a81bd Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: I738499686fb1a11fc4f164fdd774dc0f9bfda6b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 ↵Yabin Cui
am: c675d90a82 am: bb5e926ee8 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: I471cbd8188da7a058f688001959035b61cd87147 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 ↵Yabin Cui
am: c675d90a82 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: Ie7a12291533030e933fcf4cc1ed6b3300a472d61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: Ifd0f1df822d6026f67486fc403fde03ebc842c90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles."Yabin Cui
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ie1b27d286785c75292449886030bd6420b5a2c6d Change-Id: I93f2de585186b20ca8d2e7b5d5bbe95f80931df1
2022-04-01simpleperf: fix a segfault caused by CloseEventFiles.Yabin Cui
In aosp/2052096, simpleperf closes event files when stopping recording. After that, GetEventAttrWithId()[0].ids is empty, which makes ProcessJITDebugInfo() segfault. To fix it, save result of GetEventAttrWithId() in dumping_attr_id_ when preparing recording, and use dumping_attr_id_ in ProcessJITDebugInfo(). Bug: 227220328 Test: run simpleperf_unit_test Change-Id: I99678ff5defc7ca998a08b2cec22f7a84d1ed7bd
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2 am: ↵Yabin Cui
d01120acf0 am: b7a4062363 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: Id3559eecd035ab63b58079de016081e274074482 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2 am: d01120acf0Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: Iee4910a4379eb44170d59e00b55fa0e9a2e5dc46 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: Id98ec3f0963155d08c09a2a0968fd1f7354e6451 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: I41f1a1b10bdf625de7d5c4e813e4d3cc5b213b37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7cYabin Cui
* changes: simpleperf: raise priority of stop recording events. simpleperf: Make stop recording time more accurate.
2022-04-01Merge "Non-module target." am: e518a5d38e am: ac6f8d438c am: 8ce7a8d069 am: ↵Bob Badour
e0d4d7e891 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I3b0b3dbedc6fcf8910312090f54f81057ff2aca0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: e518a5d38e am: ac6f8d438c am: 8ce7a8d069Bob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I0460ade55857434d981042d49320bd2f05aebd38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: e518a5d38e am: ac6f8d438cBob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I26618fad786a7c48a85ec012ce7d55570da504ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: e518a5d38eBob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I6fcb63b4515cab609346ab5b38b6376cd6b14f49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target."Bob Badour
2022-03-31simpleperf: raise priority of stop recording events.Yabin Cui
Simpleperf main thread handles several events, like processing records from record read thread, periodically checking JIT debug file updates, etc. Some events may take significant time to finish, and slow down reaction to stop recording events. To alleviate it, this CL raises priority of stop recording events. So they only need to wait for the currently running event. Bug: 227220328 Test: run simpleperf_unit_test Change-Id: Ib0160fe1da6d81cae8e71f25a5870d320706d2a9
2022-03-31simpleperf: Make stop recording time more accurate.Yabin Cui
simpleperf stops recording in FinishReadMmapEventData(). It contains two steps: 1. Stop record read thread. 2. Process records in userspace buffer. But if the second steps takes significant time, users may think simpleperf doesn't receive the stop recording command. To avoid that, this CL moves the second step to post processing. This CL also closes event files when stopping recording. That prevents the kernel from generating more samples, which may slow down post processing. Bug: 227220328 Test: run simpleperf_unit_test Change-Id: Ib5a11b7ce039e2133a9070a10508da514197e610
2022-03-31Non-module target.Bob Badour
Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I29bd295be1a6aef16ae9b9ccdb9bef3365cc4a0c
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel." am: ↵Yabin Cui
43ccc71e3d am: ab47ce778e am: a4e62a8cdf am: e7d079131c Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2050287 Change-Id: Ib46a8c97d7a3b01cd7450435152ada4f547ee274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel." am: ↵Yabin Cui
43ccc71e3d am: ab47ce778e am: a4e62a8cdf Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2050287 Change-Id: I66a4ba29a34d79543b0508657f3e9ccf2d96c936 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel." am: ↵Yabin Cui
43ccc71e3d am: ab47ce778e Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2050287 Change-Id: Ie1b27d286785c75292449886030bd6420b5a2c6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel." am: 43ccc71e3dYabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2050287 Change-Id: If063512182204663ffabfbe1475bf600731c610f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel."Yabin Cui
2022-03-30simpleperf: update doc for supporting ETM in the kernel.Yabin Cui
1. Recommend building coresight driver as modules on kernel 5.10+. 2. Add a link of missing patches in kernel 5.4. 3. Suggest optional flags in ETM device tree. Bug: 226705914 Test: None Change-Id: I79cbb05fce4677c869c5b56a74b2633548d4f282
2022-03-30Merge "simpleperf: sign darwin executables when testing." am: 3d010d726d am: ↵Treehugger Robot
cc3514332c am: 21b3025f07 am: 9e7120609d Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2045743 Change-Id: Ie69fe2bf69e5303221b2fc8c37378bb6c767c6c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "simpleperf: sign darwin executables when testing." am: 3d010d726d am: ↵Treehugger Robot
cc3514332c am: 21b3025f07 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2045743 Change-Id: Id4959ff93f8a1c07367f4992fc2cb89ba0213b06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "simpleperf: sign darwin executables when testing." am: 3d010d726d am: ↵Treehugger Robot
cc3514332c Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2045743 Change-Id: I0110cac8fba34f8e298c71a5c64f72640e2b56ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "simpleperf: sign darwin executables when testing." am: 3d010d726dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2045743 Change-Id: I59abdc1ea2aee4ef8176583f0b1e58fec03ccdb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "simpleperf: sign darwin executables when testing."Treehugger Robot
2022-03-30simpleperf: sign darwin executables when testing.Yabin Cui
Otherwise they can't run on M1 Mac. Bug: none Test: run test.py Change-Id: Idbed2c191b7c79cd13e27d5f9e38c53df7b27b9d
2022-03-30Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d am: f8c69c1eb7 am: ↵Colin Cross
58d441ba68 am: 8c6be20f6e Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2048207 Change-Id: I925f42fa85f47a1336cbbb30dfd2d652d99a9736 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "Tweak linux_glibc properties for musl builds in system/extras" am: ↵Colin Cross
5cb11a82cc am: 8a4c799617 am: 378918ad3b am: 77b1373b60 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2044007 Change-Id: I58f714539bee283698127e6a4ad7f03c05c71a77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d am: f8c69c1eb7 am: 58d441ba68Colin Cross
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2048207 Change-Id: I0f634ea7bdc94bfa909b8db3205830c24c6ee78f 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-06-20 20:56:20 +0000