diff options
| author | Yabin Cui <yabinc@google.com> | 2021-05-14 19:25:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 19:25:02 +0000 |
| commit | 86832539d1d8f89b76549928156e5be31265f1d7 (patch) | |
| tree | f66800d69bc51a64c028b00215abbc21f47e7601 | |
| parent | 891411c1d4fa78107408b0f11a8be0e4e463262d (diff) | |
| parent | b8c63387c58eb159b593c1a26bcab7b2727497ba (diff) | |
| download | extras-86832539d1d8f89b76549928156e5be31265f1d7.tar.gz | |
Merge "simpleperf: add more device info in recording file." am: b8c63387c5
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1706486
Change-Id: I72739008af0bc074c0fc1d7f90a77460e84abf0b
| -rw-r--r-- | simpleperf/cmd_record.cpp | 2 | ||||
| -rw-r--r-- | simpleperf/cmd_record_test.cpp | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp index 2e646bb4..18e4888c 100644 --- a/simpleperf/cmd_record.cpp +++ b/simpleperf/cmd_record.cpp @@ -1914,6 +1914,8 @@ bool RecordCommand::DumpMetaInfoFeature(bool kernel_symbols_available) { android::base::GetProperty("ro.product.model", "").c_str(), android::base::GetProperty("ro.product.name", "").c_str()); 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", ""); if (!app_package_name_.empty()) { info_map["app_package_name"] = app_package_name_; } diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index 3e0b9e1a..c59641ca 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -1177,3 +1177,18 @@ TEST(record_cmd, add_meta_info_option) { ASSERT_FALSE(RunRecordCmd({"--add-meta-info", "key1="}, tmpfile.path)); ASSERT_FALSE(RunRecordCmd({"--add-meta-info", "=value1"}, tmpfile.path)); } + +TEST(record_cmd, device_meta_info) { + TemporaryFile tmpfile; + ASSERT_TRUE(RunRecordCmd({}, tmpfile.path)); + auto reader = RecordFileReader::CreateInstance(tmpfile.path); + ASSERT_TRUE(reader); + + const std::unordered_map<std::string, std::string>& meta_info = reader->GetMetaInfoFeature(); + auto it = meta_info.find("android_sdk_version"); + ASSERT_NE(it, meta_info.end()); + ASSERT_FALSE(it->second.empty()); + it = meta_info.find("android_build_type"); + ASSERT_NE(it, meta_info.end()); + ASSERT_FALSE(it->second.empty()); +} |