commit 4e868fa7b8c47600695ff92deeb373674956a67d
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 21 17:16:44 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Apr 27 16:04:13 2017 +0100
tree acdb92a2b765cc87a08459267e430a8866e608cf
parent 4dc06e2ef900132d8395539842c35533da8b912a

Make vdex and dexlayout compatible.

Unquicken the vdex before dexlayout, to keep the dex integrity.

bug: 37558732
Test: run-test with speed-profile

Change-Id: Ifcd5c2e4378ccb0df0a66d07f68df31d94b83220

runtime/oat_file_assistant.cc

diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index 9471cba..2c2b6fd 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -808,6 +808,7 @@
       std::unique_ptr<VdexFile> vdex = VdexFile::Open(vdex_filename,
                                                       /*writeable*/false,
                                                       /*low_4gb*/false,
+                                                      /*unquicken*/false,
                                                       &error_msg);
       if (vdex == nullptr) {
         status_ = kOatCannotOpen;