Convert to StandardDex in fixup_dex_dex_file

In fixup_dex_file, run dexlayout to convert compact dex back to
standard dex since the output is supposed to be standard dex.

Fixed a bug in dexlayout where conversion from compact dex ->
standard dex was not supported becuase the dex header was always
preserved.

Test: test/testrunner/testrunner.py  --host ---redefine-stress --compact-dex-level fast
Bug: 63756964

Change-Id: Id13e8593458213e7040d053c35e8914404ae5381

1 files changed, 2 insertions, 0 deletions

diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index 9ba7068176..0283999d54 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -68,6 +68,7 @@ art_cc_library {
     shared_libs: [
         "libart",
         "libart-compiler",
+        "libart-dexlayout",
     ],
 }
 
@@ -80,5 +81,6 @@ art_cc_library {
     shared_libs: [
         "libartd",
         "libartd-compiler",
+        "libartd-dexlayout",
     ],
 }