summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-12-06 00:11:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-12-06 00:11:28 +0000
commit4588b6e35e0094817765de376d67269c7377240f (patch)
treed2c88ea69381ea1955920b36f6142c4fa4418995
parent285f61dffd0d2e85402176febacc1686349891a5 (diff)
parent39154c10eab639764409e4ff5fe92082a98932f6 (diff)
downloadextras-4588b6e35e0094817765de376d67269c7377240f.tar.gz
Merge "Snap for 6050363 from e347715fae1315b153f23f2775ef7178b0b73507 to pie-vts-release" into pie-vts-releaseandroid-vts-9.0_r12
-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 216fe2d1..ebf5a245 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -240,7 +240,8 @@ bool HasHardwareCounter() {
if (android::base::ReadFileToString("/proc/cpuinfo", &cpu_info)) {
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"(SC7731e)")) ||
+ std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)"))) {
has_hw_counter = 0;
}
}