diff options
author | 2017-10-10 11:54:29 -0700 | |
---|---|---|
committer | 2017-10-11 14:47:06 -0700 | |
commit | 79c87da9d4698ec58ece65af0065eebd55a1cfe0 (patch) | |
tree | 399797f37712da9d20829d5b5059b6c84943cb02 /runtime/native/dalvik_system_DexFile.cc | |
parent | 656e97f949df4081fba908113406b32915174502 (diff) |
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
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
-rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index d40e6d94c9..e75d097220 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -26,6 +26,7 @@ #include "common_throws.h" #include "compiler_filter.h" #include "dex_file-inl.h" +#include "dex_file_loader.h" #include "jni_internal.h" #include "mirror/class_loader.h" #include "mirror/object-inl.h" @@ -185,12 +186,12 @@ static const DexFile* CreateDexFile(JNIEnv* env, std::unique_ptr<MemMap> dex_mem dex_mem_map->Begin(), dex_mem_map->End()); std::string error_message; - std::unique_ptr<const DexFile> dex_file(DexFile::Open(location, - 0, - std::move(dex_mem_map), - /* verify */ true, - /* verify_location */ true, - &error_message)); + std::unique_ptr<const DexFile> dex_file(DexFileLoader::Open(location, + 0, + std::move(dex_mem_map), + /* verify */ true, + /* verify_location */ true, + &error_message)); if (dex_file == nullptr) { ScopedObjectAccess soa(env); ThrowWrappedIOException("%s", error_message.c_str()); |