diff options
| author | Natalie Chiu <natalie_chiu@arcadyan.com> | 2020-06-05 19:28:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 19:28:05 +0000 |
| commit | edbaad6e8fbe816c3f0f66b02f054f6e3f0b0868 (patch) | |
| tree | 36a5d69453c98b98aa05fe41a65c9bf88008927c | |
| parent | 187881e5961b19bf89c9f3ae1b9e0f102be67513 (diff) | |
| parent | 756a972f99ed337c3a5b4735969596708861cf64 (diff) | |
| download | extras-edbaad6e8fbe816c3f0f66b02f054f6e3f0b0868.tar.gz | |
simpleperf: add Broadcom STB into whitelist, omit tests requiring hw counters. am: 756a972f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11735563
Change-Id: Ibf73c7aca5e698ce98b4e7a3a955ab746e8d1121
| -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 0879f955..fdb6f5e3 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; } } |