diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-19 01:22:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-19 01:22:54 +0000 |
commit | 049870858952a1a7516fa3d11c08d6bdebdbcab2 (patch) | |
tree | b8149099d02d2c87c3560f91278a3ea0a1bde480 | |
parent | c5db4be612569290dd3e1315588d674e64f650ee (diff) | |
parent | d9fb8dd703637f735fbb8aab17de31a265a59ab0 (diff) | |
download | extras-049870858952a1a7516fa3d11c08d6bdebdbcab2.tar.gz |
Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800" into android12L-tests-dev am: d9fb8dd703
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049052
Change-Id: Ieaab6a03bcc4c5da5cbcd85365dda2427c3fd50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | simpleperf/cmd_record_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index 01861c60..d3071a30 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -877,6 +877,7 @@ TEST(record_cmd, check_trampoline_after_art_jni_methods) { auto reader = RecordFileReader::CreateInstance(helper.GetDataPath()); ASSERT_TRUE(reader); ThreadTree thread_tree; + reader->LoadBuildIdAndFileFeatures(thread_tree); auto get_symbol_name = [&](ThreadEntry* thread, uint64_t ip) -> std::string { const MapEntry* map = thread_tree.FindMap(thread, ip, false); |