Merge "ART: Allow to compile interpret-only mips64 files"

diff --cc compiler/Android.mk
Simple merge

diff --cc compiler/driver/compiler_driver.cc
index e371807,968c77e..56bed39
--- 1/compiler/driver/compiler_driver.cc
--- 2/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@@ -362,10 -361,9 +362,10 @@@ CompilerDriver::CompilerDriver(const Co
        stats_(new AOTCompilationStats),
        dump_stats_(dump_stats),
        dump_passes_(dump_passes),
 +      dump_cfg_file_name_(dump_cfg_file_name),
        timings_logger_(timer),
        compiler_context_(nullptr),
-       support_boot_image_fixup_(instruction_set != kMips),
+       support_boot_image_fixup_(instruction_set != kMips && instruction_set != kMips64),
        dedupe_code_("dedupe code", *swap_space_allocator_),
        dedupe_src_mapping_table_("dedupe source mapping table", *swap_space_allocator_),
        dedupe_mapping_table_("dedupe mapping table", *swap_space_allocator_),

diff --cc dex2oat/dex2oat.cc
Simple merge