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/native/java_lang_VMClassLoader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/native/java_lang_VMClassLoader.cc') 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 javaPath(env, env->NewStringUTF(location.c_str())); if (javaPath.get() == nullptr) { -- cgit v1.2.3-59-g8ed1b