commit de1b2a2113b9e2c44b90c441177060142c7abbfd
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 27 09:10:57 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 27 12:44:48 2019 +0000
tree 1e710fb3c5fdf8c11858a6a2418a53a5ad1ab1d8
parent ffe26cc54fac4f1997e5dbf6991da9e95ce49e31

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

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index edefd0a..71f71d1 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -808,8 +808,7 @@
     }
 
     if (!IsBootImage() && parser_options->boot_image_filename.empty()) {
-      parser_options->boot_image_filename += android_root_;
-      parser_options->boot_image_filename += "/framework/boot.art";
+      parser_options->boot_image_filename = GetDefaultBootImageLocation(android_root_);
     }
     if (!parser_options->boot_image_filename.empty()) {
       boot_image_filename_ = parser_options->boot_image_filename;