Merge changes from topic 'dex2oat_dexlayout'

* changes:
  Add layout scheme to dexlayout for dex file reordering.
  Add new --layout-profile compiler-filter for dex2oat.
  Dexlayout cleanup and refactoring.

1 files changed, 3 insertions, 1 deletions

diff --git a/compiler/image_test.cc b/compiler/image_test.cc
index fcb8979459..5629dffce5 100644
--- a/compiler/image_test.cc
+++ b/compiler/image_test.cc
@@ -211,7 +211,9 @@ void CompilationHelper::Compile(CompilerDriver* driver,
                                                       &driver->GetCompilerOptions(),
                                                       oat_file.GetFile()));
         elf_writers.back()->Start();
-        oat_writers.emplace_back(new OatWriter(/*compiling_boot_image*/true, &timings));
+        oat_writers.emplace_back(new OatWriter(/*compiling_boot_image*/true,
+                                               &timings,
+                                               /*profile_compilation_info*/nullptr));
       }
 
       std::vector<OutputStream*> rodata;