commit 866d874c4fca90385251a1df28eed0eb6e1b88e2
author Mathieu Chartier <mathieuc@google.com> Wed Sep 21 15:24:18 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Sep 21 18:43:45 2016 -0700
tree ae853738fe345523af56be0a021f46bc90e0d2ed
parent be0f728348139a9185b08d4d5c5adfa806bee00b

Make image test multi image

Required for testing multi image layout in future CLs.

Bug: 28640955

Test: clean-oat-host, test-art-host, device booting

(cherry picked from commit 25adcfb7dc81131add3a0a681ae18bced6f7a0e0)

Change-Id: I14809f56e711b4a87e01056c327eddbbd087f4ee

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 15e3b1c..2be3b52 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -856,9 +856,9 @@
       const OatHeader& boot_oat_header = oat_file->GetOatHeader();
       const char* boot_cp = boot_oat_header.GetStoreValueByKey(OatHeader::kBootClassPathKey);
       if (boot_cp != nullptr) {
-        gc::space::ImageSpace::CreateMultiImageLocations(image_locations[0],
-                                                         boot_cp,
-                                                         &image_locations);
+        gc::space::ImageSpace::ExtractMultiImageLocations(image_locations[0],
+                                                          boot_cp,
+                                                          &image_locations);
       }
     }