diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-01-16 18:45:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-16 18:45:34 +0000 |
| commit | 078d740f2e5141e2caba410ecc4b1db9a5ff05bc (patch) | |
| tree | d2c88ea69381ea1955920b36f6142c4fa4418995 | |
| parent | 314643ff0d5a4758cfcfe50f26f87de68f17f31f (diff) | |
| parent | e7699adc4f8a80bb60534fb06ee6fad5d9edeebb (diff) | |
| download | extras-android-cts-9.0_r11.tar.gz | |
Merge "Snap for 6139873 from e347715fae1315b153f23f2775ef7178b0b73507 to pie-cts-release" into pie-cts-releaseandroid-cts-9.0_r12android-cts-9.0_r11
| -rw-r--r-- | simpleperf/cmd_record_test.cpp | 3 |
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; } } |