diff options
| author | Yabin Cui <yabinc@google.com> | 2020-04-17 21:29:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-17 21:29:19 +0000 |
| commit | c01843e2c4c9865715ca9000b174c8067e7fe215 (patch) | |
| tree | 5d9bda5f7fefdcf74fd83e7ad430ab1a505bd520 | |
| parent | f37cd8c31ca075e7658c0e54922b8d4b340a81a1 (diff) | |
| parent | 9628f7fe877a5ae423f5ef082501f38f1fbde617 (diff) | |
| download | extras-c01843e2c4c9865715ca9000b174c8067e7fe215.tar.gz | |
Merge "simpleperf: add Broadcom STB into whitelist, omit tests requiring hw counters." am: 9628f7fe87
Change-Id: I2ba103e0366c6b1408a37b359e155457dad61617
| -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 25b7f9c2..161f8239 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -302,7 +302,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; } } |