From e1a2c65e9b147ac872e632f3513ac5a336cffdcc Mon Sep 17 00:00:00 2001 From: Daichi Hirono Date: Wed, 7 Sep 2022 16:24:57 +0900 Subject: simpleperf: assume gpc targets as emulator Without the change, CtsSimpleperfTestCases failed on arm64. Bug: 243612327 Test: None Change-Id: Ib4c566b0bd0e5c761d9c78620caa13703c10589c (cherry picked from commit fa815d04c8756eb2f3bd2faafcd66f829909db7b) --- simpleperf/test_util.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/simpleperf/test_util.cpp b/simpleperf/test_util.cpp index d85294f5..fcbdf98f 100644 --- a/simpleperf/test_util.cpp +++ b/simpleperf/test_util.cpp @@ -78,6 +78,7 @@ bool HasHardwareCounter() { auto arch = GetBuildArch(); 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) { -- cgit v1.2.3