commit 4a26f17b055cadc949c3e9fdfa637fe5656339d9
author Mathieu Chartier <mathieuc@google.com> Tue Jan 26 14:26:18 2016 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Jan 26 17:49:12 2016 -0800
tree d3cee26249b5ac72c57a7125ae2a73765bf77d96
parent caef579e906abc5c3174ba65e5205ea7fd5c44ad

Remove GetImageRoots read barrier for image relocation

Fixes CC assertion that failed if an app image was loaded when the GC
was running.

Bug: 26786304
Change-Id: I47bea7b4b947332b57be2e2db604c2c25d92b7e2

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index f138c81..0c06ca6 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -71,7 +71,7 @@
 #include "gc/space/image_space.h"
 #include "gc/space/space-inl.h"
 #include "handle_scope-inl.h"
-#include "image.h"
+#include "image-inl.h"
 #include "instrumentation.h"
 #include "intern_table.h"
 #include "interpreter/interpreter.h"