commit 7417ce97c4dcabbd7423d46ff9b7cdaf95c1e0f9
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 01 10:52:42 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Feb 19 17:59:31 2019 +0000
tree 3e84a40b0da5f826cbfd5ff4fb93c0b3dd4355e3
parent 794350fd0e21aa9e259b6c45394494871e7fdb13

Add support for booting with a boot classpath not fully AOTed.

Bug: 119800099
Test: adb shell setprop dalvik.vm.boot-image "/system/framework/nonexistent.art"

Change-Id: I6641399f43c24702f19f4d976c6054d77186799e

runtime/parsed_options.cc

diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index f516d0d..e644c04 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -609,8 +609,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);
   }