diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-19 21:09:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-19 21:09:50 +0000 |
| commit | 98d852d712fdd3c32b26565dce03d4b86d044ca1 (patch) | |
| tree | d0e9e74728d19a86fc36dd94bab6139e5cf46729 | |
| parent | 999afeeb3e59b930f066cb0bb0402cd1b27d0805 (diff) | |
| parent | abedc25a3d2a48208433638b5e5d6f4b07169992 (diff) | |
| download | extras-android-cts-10.0_r3.tar.gz | |
Merge "Snap for 6017365 from aa57fd3ff3dc46e4ac4f29424edd18288b2aeab6 to android10-tests-release" into android10-tests-releaseandroid-vts-10.0_r3android-vts-10.0_r2android-cts-10.0_r3
| -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 fdc26e60..4db0b072 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -268,7 +268,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; } } |