Revert "Revert "Add support for booting with a boot classpath not fully AOTed.""
This reverts commit 14bfeddf2e434954f0ca36687ac0fc5dc6412bd3.
Reason for revert: Removes obsolete DCHECK
Bug: 119800099
Change-Id: Ia984f95300c6b96165f0179bfc2f66b012bf5dbe
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index b78c152..6423f3b 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -606,8 +606,7 @@
}
if (!args.Exists(M::CompilerCallbacksPtr) && !args.Exists(M::Image)) {
- std::string image = GetAndroidRoot();
- image += "/framework/boot.art";
+ std::string image = GetDefaultBootImageLocation(GetAndroidRoot());
args.Set(M::Image, image);
}