diff options
author | Shubhangi Pawar <svpawar@google.com> | 2022-09-15 22:34:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-15 22:34:12 +0000 |
commit | a7b33ad26fccb7f16abb2592d4b535032c28fe42 (patch) | |
tree | 1dd5c9a3b955c541c00b4621fa3e02051606f028 | |
parent | 1c0dfa0a089a54696a352739725bfc3fa82c18ba (diff) | |
parent | 942b61f7cfcd162d4ffd56ef312417df11976cde (diff) | |
download | extras-a7b33ad26fccb7f16abb2592d4b535032c28fe42.tar.gz |
Merge "simpleperf: assume gpc targets as emulator" into android12L-tests-dev am: 942b61f7cf
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2216082
Change-Id: I279cb25b42ff4b57fa1fe623a68b97c1ed42cd66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | simpleperf/test_util.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/simpleperf/test_util.cpp b/simpleperf/test_util.cpp index 6dae04cd..43e21831 100644 --- a/simpleperf/test_util.cpp +++ b/simpleperf/test_util.cpp @@ -78,6 +78,7 @@ bool HasHardwareCounter() { auto arch = GetTargetArch(); std::string fingerprint = android::base::GetProperty("ro.system.build.fingerprint", ""); bool is_emulator = android::base::StartsWith(fingerprint, "google/sdk_gphone") || + android::base::StartsWith(fingerprint, "google/sdk_gpc") || android::base::StartsWith(fingerprint, "generic/cf"); if (arch == ARCH_X86_64 || arch == ARCH_X86_32 || is_emulator) { |