summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-04-21 20:08:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-21 20:08:34 +0000
commit42c05b95b333b54b2bbb3bad04084aed8bd473ac (patch)
tree5e8adc14e630658e81e141ac15855108d18e1463
parent078d740f2e5141e2caba410ecc4b1db9a5ff05bc (diff)
parentace46dbbc2279410b8180e0dd55fe2ea39faefea (diff)
downloadextras-42c05b95b333b54b2bbb3bad04084aed8bd473ac.tar.gz
Merge "Snap for 6412020 from 9a66ee5c362accc7706b9d54582e89404418e0f7 to pie-cts-release" into pie-cts-release
-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;
}
}