summaryrefslogtreecommitdiff
path: root/runtime/class_loader_context.cc
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2022-07-04 14:49:08 +0100
committer Jiakai Zhang <jiakaiz@google.com> 2022-07-05 16:30:09 +0100
commit33dce90e7f1d1d15a4af1b8542f192cd28673f0c (patch)
tree22335197ad1b8a9463c747e1ec030d35d22ec910 /runtime/class_loader_context.cc
parent419e5a1277e68813179cf99852e3cf6bc426bcbf (diff)
Update ClassLoaderContext to support artd use cases.
- Change `FlattenDexPaths` to returning `std::vector<std::string>` so that artd can use it in a more flexible way. Bug: 229268202 Test: Presubmit Change-Id: Iab0d018d4f52eea6b60f7f2d88cc56f23db6bd5c Merged-In: Iab0d018d4f52eea6b60f7f2d88cc56f23db6bd5c (cherry picked from commit 55e733f0f582f3edafa2b3bfd1168ade01813a54)
Diffstat (limited to 'runtime/class_loader_context.cc')
-rw-r--r--runtime/class_loader_context.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index 2419b7b720..31c310e1ec 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -950,12 +950,13 @@ std::vector<const DexFile*> ClassLoaderContext::FlattenOpenedDexFiles() const {
return result;
}
-std::string ClassLoaderContext::FlattenDexPaths() const {
+std::vector<std::string> ClassLoaderContext::FlattenDexPaths() const {
+ std::vector<std::string> result;
+
if (class_loader_chain_ == nullptr) {
- return "";
+ return result;
}
- std::vector<std::string> result;
std::vector<ClassLoaderInfo*> work_list;
work_list.push_back(class_loader_chain_.get());
while (!work_list.empty()) {
@@ -966,7 +967,7 @@ std::string ClassLoaderContext::FlattenDexPaths() const {
}
AddToWorkList(info, work_list);
}
- return FlattenClasspath(result);
+ return result;
}
const char* ClassLoaderContext::GetClassLoaderTypeName(ClassLoaderType type) {