summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-06-07 07:11:40 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-06-07 07:11:40 +0000
commitcb4431cc002780b911cf2910b039023e3225586e (patch)
tree36a5d69453c98b98aa05fe41a65c9bf88008927c
parentec496a8ff9c3d518bfbf7df88f0a3ef44cd67273 (diff)
parent4d988df69d49c289d54714507c25bdaec6a32566 (diff)
downloadextras-cb4431cc002780b911cf2910b039023e3225586e.tar.gz
Snap for 6566263 from 4d988df69d49c289d54714507c25bdaec6a32566 to mainline-release
Change-Id: Iaa08b74cf5ea8f5a70fd055c26534ef31cf54c5f
-rw-r--r--simpleperf/cmd_record_test.cpp3
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;
}
}