diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-19 01:01:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-19 01:01:46 +0000 |
| commit | aa57fd3ff3dc46e4ac4f29424edd18288b2aeab6 (patch) | |
| tree | d0e9e74728d19a86fc36dd94bab6139e5cf46729 | |
| parent | 999afeeb3e59b930f066cb0bb0402cd1b27d0805 (diff) | |
| parent | 44b4a19b44c4e1d791c60df763820729d2ca5c63 (diff) | |
| download | extras-aa57fd3ff3dc46e4ac4f29424edd18288b2aeab6.tar.gz | |
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." into android10-tests-dev
| -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; } } |