From 79c87da9d4698ec58ece65af0065eebd55a1cfe0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 10 Oct 2017 11:54:29 -0700 Subject: Add DexFileLoader class Added DexFileLoader class, moved functionality from DexFile there: - Multidex loading logic - DexFile opening logic for Zip and etc - Some other helpers Bug: 63756964 Test: test-art-host Change-Id: Ic3dfa458947d4b69912dea5cdd836e7e8f55061c --- runtime/class_loader_context_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/class_loader_context_test.cc') diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index ae3dcecb4a..be6acde4a9 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -100,12 +100,13 @@ class ClassLoaderContextTest : public CommonRuntimeTest { info.opened_dex_files[cur_open_dex_index++]; std::unique_ptr& expected_dex_file = (*all_dex_files)[k]; - std::string expected_location = expected_dex_file->GetBaseLocation(); + std::string expected_location = + DexFileLoader::GetBaseLocation(expected_dex_file->GetLocation()); UniqueCPtr expected_real_location( realpath(expected_location.c_str(), nullptr)); ASSERT_TRUE(expected_real_location != nullptr) << expected_location; expected_location.assign(expected_real_location.get()); - expected_location += DexFile::GetMultiDexSuffix(expected_dex_file->GetLocation()); + expected_location += DexFileLoader::GetMultiDexSuffix(expected_dex_file->GetLocation()); ASSERT_EQ(expected_location, opened_dex_file->GetLocation()); ASSERT_EQ(expected_dex_file->GetLocationChecksum(), opened_dex_file->GetLocationChecksum()); -- cgit v1.2.3-59-g8ed1b