OSDN Git Service

Fix dex2oat/oatdump cross-compilation.
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 23 Mar 2016 16:35:51 +0000 (16:35 +0000)
committerMathieu Chartier <mathieuc@google.com>
Tue, 29 Mar 2016 16:47:01 +0000 (09:47 -0700)
commite9300271556e47639cade1ec5fdf8f66b3724d03
tree2c6f664355ffdbcc9ebf41d5c361f0058cb0fe56
parenta54e05aa8d2c4dca042ea924558738adb23ac730
Fix dex2oat/oatdump cross-compilation.

Only set the ImtConflictTable when not in AOT, to not mess up
with the image.

(cherry picked from commit 40c68c690546e8c15dcb2de6137e72c74f573a75)

Change-Id: I7bff3a18cc06184ed9d7d63ab433f286884f19e7
runtime/runtime.cc