summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-04-23 23:07:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-23 23:07:15 +0000
commit7db6dd40a3180dbdb323e95120782e35f4015bf5 (patch)
tree5e8adc14e630658e81e141ac15855108d18e1463
parent4588b6e35e0094817765de376d67269c7377240f (diff)
parentf4bd20ada01d31755f3065bff07761686791028e (diff)
downloadextras-7db6dd40a3180dbdb323e95120782e35f4015bf5.tar.gz
Merge "Snap for 6421512 from 9a66ee5c362accc7706b9d54582e89404418e0f7 to pie-vts-release" into pie-vts-releaseandroid-vts-9.0_r13
-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 ebf5a245..c09592e8 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -241,7 +241,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;
}
}