Merge "ART: Allow method references across oat files for multi-image, 2nd attempt."

diff --cc build/Android.gtest.mk
Simple merge

diff --cc compiler/Android.mk
Simple merge

diff --cc compiler/driver/compiler_driver.cc
Simple merge

diff --cc compiler/driver/compiler_driver.h
Simple merge

diff --cc compiler/image_writer.cc
index 3d31309,97ad9b3..aeb89f4
--- 1/compiler/image_writer.cc
--- 2/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@@ -2295,16 -2177,10 +2184,12 @@@ ImageWriter::ImageWriter
        dirty_methods_(0u),
        clean_methods_(0u),
        image_storage_mode_(image_storage_mode),
-       dex_file_oat_filename_map_(dex_file_oat_filename_map),
        oat_filenames_(oat_filenames),
-       default_oat_filename_(oat_filenames[0]) {
+       dex_file_oat_index_map_(dex_file_oat_index_map) {
    CHECK_NE(image_begin, 0U);
-   for (const char* oat_filename : oat_filenames) {
-     image_info_map_.emplace(oat_filename, ImageInfo());
-   }
    std::fill_n(image_methods_, arraysize(image_methods_), nullptr);
 +  CHECK_EQ(compile_app_image, !Runtime::Current()->GetHeap()->GetBootImageSpaces().empty())
 +      << "Compiling a boot image should occur iff there are no boot image spaces loaded";
  }
  
  ImageWriter::ImageInfo::ImageInfo()

diff --cc compiler/image_writer.h
Simple merge

diff --cc compiler/jit/jit_compiler.cc
Simple merge

diff --cc compiler/oat_test.cc
Simple merge

diff --cc dex2oat/dex2oat.cc
Simple merge