commit f7e1ab5224e16a47a410a788915422c73abfffac
author Nicolas Geoffray <ngeoffray@google.com> Wed Jun 01 15:16:08 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 01 15:16:08 2016 +0000
tree 2712109d35b5c91542af4c2b72af9c0e69395462
parent 0844e03ba790531599d29a9bb031517a165e941f
parent cc98f634847914d306d9c1ae16c46b95e0645270

Merge "Revert "Make the boot image non-debuggable.""

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index db26799..cce83f3 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -685,6 +685,12 @@
       Usage("Can't have both --image and (--app-image-fd or --app-image-file)");
     }
 
+    if (IsBootImage()) {
+      // We need the boot image to always be debuggable.
+      // TODO: Remove this once we better deal with full frame deoptimization.
+      compiler_options_->debuggable_ = true;
+    }
+
     if (oat_filenames_.empty() && oat_fd_ == -1) {
       Usage("Output must be supplied with either --oat-file or --oat-fd");
     }