commit 91288d8f03b9aab28b61a4a76e552ad7e0c15c8b
author Mathieu Chartier <mathieuc@google.com> Thu Apr 28 09:44:54 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Apr 28 15:18:24 2016 -0700
tree f4d7265c8e96375905da749f858672b37580e596
parent d23d7d145c86975acbcc75505b8a323337066ac0

Revert "Revert "Write conflict tables in image""

Added test.

Bug: 27906566

This reverts commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6.

(cherry picked from commit cdca476bf3394ce9d97a369e84e701b427009318)

Change-Id: Ia94fc7acc7ae3879921c4e8d0a02b156037ac286

compiler/common_compiler_test.cc

diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index f75a252..bf29e1c 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -180,6 +180,7 @@
                                             isa,
                                             instruction_set_features_.get(),
                                             /* boot_image */ true,
+                                            /* app_image */ false,
                                             GetImageClasses(),
                                             GetCompiledClasses(),
                                             GetCompiledMethods(),