summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-04-19 01:22:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-19 01:22:59 +0000
commitbc87a068b500b2ce254c89fdd0e154914e441102 (patch)
treeb8149099d02d2c87c3560f91278a3ea0a1bde480
parentc5db4be612569290dd3e1315588d674e64f650ee (diff)
parent049870858952a1a7516fa3d11c08d6bdebdbcab2 (diff)
downloadextras-bc87a068b500b2ce254c89fdd0e154914e441102.tar.gz
Merge "Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800" into android12L-tests-dev am: d9fb8dd703" into android13-tests-dev
-rw-r--r--simpleperf/cmd_record_test.cpp1
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);