Merge "simpleperf: Add support for new perf ETE files."
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
index c770d1e..b156780 100644
--- a/ext4_utils/Android.bp
+++ b/ext4_utils/Android.bp
@@ -101,6 +101,7 @@
"mke2fs.conf",
],
visibility: [
+ "//development/build",
"//system/apex/apexer",
],
}
diff --git a/simpleperf/cmd_inject_test.cpp b/simpleperf/cmd_inject_test.cpp
index dbe742c..daad83c 100644
--- a/simpleperf/cmd_inject_test.cpp
+++ b/simpleperf/cmd_inject_test.cpp
@@ -87,10 +87,7 @@
}
TEST(cmd_inject, exclude_perf_option) {
- ASSERT_FALSE(RunInjectCmd({"--exclude-perf"}, nullptr));
- std::string perf_with_recording_process =
- GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf_with_recording_process.data");
- ASSERT_TRUE(RunInjectCmd({"--exclude-perf", "-i", perf_with_recording_process}, nullptr));
+ ASSERT_TRUE(RunInjectCmd({"--exclude-perf"}, nullptr));
}
TEST(cmd_inject, output_option) {
diff --git a/simpleperf/testdata/etm/perf.data b/simpleperf/testdata/etm/perf.data
index 10481f5..595443d 100644
--- a/simpleperf/testdata/etm/perf.data
+++ b/simpleperf/testdata/etm/perf.data
Binary files differ
diff --git a/simpleperf/testdata/etm/perf_kernel.data b/simpleperf/testdata/etm/perf_kernel.data
index 11f399f..be53a31 100644
--- a/simpleperf/testdata/etm/perf_kernel.data
+++ b/simpleperf/testdata/etm/perf_kernel.data
Binary files differ
diff --git a/simpleperf/testdata/etm/perf_with_recording_process.data b/simpleperf/testdata/etm/perf_with_recording_process.data
deleted file mode 100644
index 92293bd..0000000
--- a/simpleperf/testdata/etm/perf_with_recording_process.data
+++ /dev/null
Binary files differ
diff --git a/simpleperf/testdata/etm/rq_stats.ko b/simpleperf/testdata/etm/rq_stats.ko
index c35dcd3..6181a0c 100644
--- a/simpleperf/testdata/etm/rq_stats.ko
+++ b/simpleperf/testdata/etm/rq_stats.ko
Binary files differ
