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/openjdkjvmti/fixed_up_dex_file.cc

diff --git a/runtime/openjdkjvmti/fixed_up_dex_file.cc b/runtime/openjdkjvmti/fixed_up_dex_file.cc
index 3338358..29aebae 100644
--- a/runtime/openjdkjvmti/fixed_up_dex_file.cc
+++ b/runtime/openjdkjvmti/fixed_up_dex_file.cc
@@ -32,10 +32,8 @@
 #include "fixed_up_dex_file.h"
 #include "dex_file-inl.h"
 
-// Compiler includes.
-#include "dex/dex_to_dex_decompiler.h"
-
 // Runtime includes.
+#include "dex_to_dex_decompiler.h"
 #include "oat_file.h"
 #include "vdex_file.h"