Merge "simpleperf: test profiling apps with the same abi." am: 16f464c226

am: d24f22a950

Change-Id: Iaba6efa43332763e21ea05f4021481559bacb685

1 files changed, 15 insertions, 1 deletions

diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 701c9cc2..184f9359 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -747,7 +747,7 @@ TEST(record_cmd, cpu_percent_option) {
 class RecordingAppHelper {
  public:
   bool InstallApk(const std::string& apk_path, const std::string& package_name) {
-    if (Workload::RunCmd({"pm", "install", "-t", apk_path})) {
+    if (Workload::RunCmd({"pm", "install", "-t", "--abi", GetABI(), apk_path})) {
       installed_packages_.emplace_back(package_name);
       return true;
     }
@@ -785,6 +785,20 @@ class RecordingAppHelper {
   }
 
  private:
+  const char* GetABI() {
+#if defined(__i386__)
+    return "x86";
+#elif defined(__x86_64__)
+    return "x86_64";
+#elif defined(__aarch64__)
+    return "arm64-v8a";
+#elif defined(__arm__)
+    return "armeabi-v7a";
+#else
+    #error "unrecognized ABI"
+#endif
+  }
+
   std::vector<std::string> installed_packages_;
   std::unique_ptr<Workload> app_start_proc_;
   TemporaryFile perf_data_file_;