Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
simpleperf: fix check_trampoline_after_art_jni_methods test.
simpleperf: assume gpc targets as emulator
simpleperf: accept failures when getting hw counters on a cpu.
simpleperf: stat: don't open event files across cpus.
simpleperf: update --print-hw-counter to check each cpu.
simpleperf: stat: remove percentage in csv output.
Change-Id: Ie81ee6e8cfc0793a8160942d36d111d599419e9b
diff --git a/simpleperf/test_util.cpp b/simpleperf/test_util.cpp
index 6dae04c..43e2183 100644
--- a/simpleperf/test_util.cpp
+++ b/simpleperf/test_util.cpp
@@ -78,6 +78,7 @@
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) {