summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-06-06 01:01:02 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-06-06 01:01:02 +0000
commitce8b6bd86f096594b70b7b5cd26dccadd467e6ee (patch)
tree36a5d69453c98b98aa05fe41a65c9bf88008927c
parent8c81d5a9f2946974cf97d07e1ae8d863a693cbd3 (diff)
parentedbaad6e8fbe816c3f0f66b02f054f6e3f0b0868 (diff)
downloadextras-ce8b6bd86f096594b70b7b5cd26dccadd467e6ee.tar.gz
Snap for 6564289 from edbaad6e8fbe816c3f0f66b02f054f6e3f0b0868 to rvc-d1-release
Change-Id: Ifb227a7e5d31efedd6e22a60ba21780135d4b3d4
-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;
}
}