diff options
| author | 2025-02-06 16:09:06 +0000 | |
|---|---|---|
| committer | 2025-02-18 02:37:43 -0800 | |
| commit | 5bcb526ba52f9bef4b85fcc27c497428425be683 (patch) | |
| tree | 38100dadc430885ff323066828fb58cdc053d8ce /dex2oat | |
| parent | 70c0403aff06094c6b291fc0c3abb503beaeb1f0 (diff) | |
Support loading an ELF file from a zip file.
Bug: 377474232
Test: art/test.py --host -g
Change-Id: I0674378b5aaba1da4d6e623ac8db9e2c4acd4ed5
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat_test.cc | 3 | ||||
| -rw-r--r-- | dex2oat/linker/elf_writer_test.cc | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc index da97a4effd..31891fd2b5 100644 --- a/dex2oat/dex2oat_test.cc +++ b/dex2oat/dex2oat_test.cc @@ -2032,8 +2032,7 @@ TEST_F(Dex2oatTest, LoadOutOfDateOatFile) { /*low_4gb=*/false, &error_msg)); ASSERT_TRUE(elf_file != nullptr) << error_msg; - ASSERT_TRUE(elf_file->Load(file.get(), - /*executable=*/false, + ASSERT_TRUE(elf_file->Load(/*executable=*/false, /*low_4gb=*/false, /*reservation=*/nullptr, &error_msg)) diff --git a/dex2oat/linker/elf_writer_test.cc b/dex2oat/linker/elf_writer_test.cc index 913f865e8f..38eec45611 100644 --- a/dex2oat/linker/elf_writer_test.cc +++ b/dex2oat/linker/elf_writer_test.cc @@ -152,8 +152,7 @@ TEST_F(ElfWriterTest, dlsym) { &error_msg); CHECK(reservation.IsValid()) << error_msg; uint8_t* base = reservation.Begin(); - success = - ef->Load(file.get(), /*executable=*/false, /*low_4gb=*/false, &reservation, &error_msg); + success = ef->Load(/*executable=*/false, /*low_4gb=*/false, &reservation, &error_msg); CHECK(success) << error_msg; CHECK(!reservation.IsValid()); EXPECT_EQ(reinterpret_cast<uintptr_t>(dl_oatdata) + reinterpret_cast<uintptr_t>(base), @@ -253,11 +252,11 @@ TEST_F(ElfWriterTest, CheckDynamicSection) { /*low_4gb=*/false, &error_msg)); ASSERT_NE(ef.get(), nullptr) << error_msg; - ASSERT_TRUE(ef->Load(tmp_oat.GetFile(), - /*executable=*/false, + ASSERT_TRUE(ef->Load(/*executable=*/false, /*low_4gb=*/false, /*reservation=*/nullptr, - &error_msg)) << error_msg; + &error_msg)) + << error_msg; const uint8_t* oatdata_ptr = ef->FindDynamicSymbolAddress("oatdata"); ASSERT_NE(oatdata_ptr, nullptr); |