diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-16 20:52:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-16 20:52:47 +0000 |
| commit | 64877bae2056bc3c6093df5d0daec8487e5beeb8 (patch) | |
| tree | aa64250a53a2c4448d108436d8898e895380545c | |
| parent | 80cedd267a52a3a770acff025741b72d79d47087 (diff) | |
| parent | 492b50aa055d76a516d67ff79156adfec7c7f5c5 (diff) | |
| download | extras-64877bae2056bc3c6093df5d0daec8487e5beeb8.tar.gz | |
Merge "simpleperf: Add build fingerprint and kernel version to reports." am: 492b50aa05
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1738546
Change-Id: Id922074d0e2b4b778658ccc20ad8facb9bfdfaa6
| -rw-r--r-- | simpleperf/cmd_record.cpp | 5 | ||||
| -rw-r--r-- | simpleperf/scripts/report_html.js | 6 | ||||
| -rwxr-xr-x | simpleperf/scripts/report_html.py | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp index 7e49307d..a70a5862 100644 --- a/simpleperf/cmd_record.cpp +++ b/simpleperf/cmd_record.cpp @@ -1918,6 +1918,11 @@ bool RecordCommand::DumpMetaInfoFeature(bool kernel_symbols_available) { info_map["android_version"] = android::base::GetProperty("ro.build.version.release", ""); info_map["android_sdk_version"] = android::base::GetProperty("ro.build.version.sdk", ""); info_map["android_build_type"] = android::base::GetProperty("ro.build.type", ""); + info_map["android_build_fingerprint"] = android::base::GetProperty("ro.build.fingerprint", ""); + utsname un; + if (uname(&un) == 0) { + info_map["kernel_version"] = un.release; + } if (!app_package_name_.empty()) { info_map["app_package_name"] = app_package_name_; if (IsRoot()) { diff --git a/simpleperf/scripts/report_html.js b/simpleperf/scripts/report_html.js index f33711bc..b0827f40 100644 --- a/simpleperf/scripts/report_html.js +++ b/simpleperf/scripts/report_html.js @@ -333,6 +333,12 @@ class RecordFileView { if (gRecordInfo.androidVersion) { rows.push(['Android Version', gRecordInfo.androidVersion]); } + if (gRecordInfo.androidBuildFingerprint) { + rows.push(['Build Fingerprint', gRecordInfo.androidBuildFingerprint]); + } + if (gRecordInfo.kernelVersion) { + rows.push(['Kernel Version', gRecordInfo.kernelVersion]); + } if (gRecordInfo.recordCmdline) { rows.push(['Record cmdline', gRecordInfo.recordCmdline]); } diff --git a/simpleperf/scripts/report_html.py b/simpleperf/scripts/report_html.py index 65a25cba..66d167bf 100755 --- a/simpleperf/scripts/report_html.py +++ b/simpleperf/scripts/report_html.py @@ -829,6 +829,8 @@ class RecordData(object): machine_type = '%s (%s) by %s, arch %s' % (model, name, manufacturer, self.arch) record_info['machineType'] = machine_type record_info['androidVersion'] = self.meta_info.get('android_version', '') + record_info['androidBuildFingerprint'] = self.meta_info.get('android_build_fingerprint', '') + record_info['kernelVersion'] = self.meta_info.get('kernel_version', '') record_info['recordCmdline'] = self.cmdline record_info['totalSamples'] = self.total_samples record_info['processNames'] = self._gen_process_names() |