diff options
Diffstat (limited to 'runtime/class_loader_context.cc')
| -rw-r--r-- | runtime/class_loader_context.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc index eab3b86d3d..ff440d7bba 100644 --- a/runtime/class_loader_context.cc +++ b/runtime/class_loader_context.cc @@ -145,6 +145,10 @@ ClassLoaderContext::ExtractClassLoaderType(const std::string& class_loader_spec) // ClasspathElem is the path of dex/jar/apk file. bool ClassLoaderContext::Parse(const std::string& spec, bool parse_checksums) { if (spec.empty()) { + // By default we load the dex files in a PathClassLoader. + // So an empty spec is equivalent to an empty PathClassLoader (this happens when running + // tests) + class_loader_chain_.push_back(ClassLoaderInfo(kPathClassLoader)); return true; } @@ -265,12 +269,16 @@ std::string ClassLoaderContext::EncodeContextForOatFile(const std::string& base_ return OatFile::kSpecialSharedLibrary; } + std::ostringstream out; if (class_loader_chain_.empty()) { - return ""; + // We can get in this situation if the context was created with a class path containing the + // source dex files which were later removed (happens during run-tests). + out << GetClassLoaderTypeName(kPathClassLoader) + << kClassLoaderOpeningMark + << kClassLoaderClosingMark; + return out.str(); } - std::ostringstream out; - for (size_t i = 0; i < class_loader_chain_.size(); i++) { const ClassLoaderInfo& info = class_loader_chain_[i]; if (i > 0) { |