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/java_lang_VMClassLoader.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/java_lang_VMClassLoader.cc')
| -rw-r--r-- | runtime/native/java_lang_VMClassLoader.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 4034e8c837..413149c510 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -17,6 +17,7 @@ #include "java_lang_VMClassLoader.h" #include "class_linker.h" +#include "dex_file_loader.h" #include "jni_internal.h" #include "mirror/class_loader.h" #include "mirror/object-inl.h" @@ -135,7 +136,7 @@ static jobjectArray VMClassLoader_getBootClassPathEntries(JNIEnv* env, jclass) { const DexFile* dex_file = path[i]; // For multidex locations, e.g., x.jar!classes2.dex, we want to look into x.jar. - const std::string& location(dex_file->GetBaseLocation()); + const std::string location(DexFileLoader::GetBaseLocation(dex_file->GetLocation())); ScopedLocalRef<jstring> javaPath(env, env->NewStringUTF(location.c_str())); if (javaPath.get() == nullptr) { |