diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-08 17:37:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 17:37:30 +0000 |
commit | a836b5fda66e3be2b6fbefaa3d75b9fdb3941027 (patch) | |
tree | 36a5d69453c98b98aa05fe41a65c9bf88008927c | |
parent | 3504c64c71385148a19f65a4b868083a389e7119 (diff) | |
parent | 8a673868f8e979b32402d0f6baf30731e6397e68 (diff) | |
download | extras-a836b5fda66e3be2b6fbefaa3d75b9fdb3941027.tar.gz |
Snap for 6564423 from 756a972f99ed337c3a5b4735969596708861cf64 to rvc-release am: 8a673868f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11764517
Change-Id: I5e5fb6aeff835638bc0feaa136e777cc986dd45f
-rw-r--r-- | simpleperf/cmd_record_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index 0879f955..fdb6f5e3 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -302,7 +302,8 @@ bool HasHardwareCounter() { std::string hardware = GetHardwareFromCpuInfo(cpu_info); if (std::regex_search(hardware, std::regex(R"(i\.MX6.*Quad)")) || std::regex_search(hardware, std::regex(R"(SC7731e)")) || - std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)"))) { + std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)")) || + std::regex_search(hardware, std::regex(R"(Broadcom STB \(Flattened Device Tree\))"))) { has_hw_counter = 0; } } |