commit de38b797c3e5ba3ee44c480db7093386975c51eb
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 30 14:50:12 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Dec 30 14:50:12 2015 +0000
tree 66fdb4f09ffe5d62f491f53b9d311ea3e7349f71
parent 288b1e9a0dddfb91e85067fe81de55174f313c7c

Revert "ART: Fix up some multi-image cases"

Fails imgdiag_test on device.

Bug: 26317072
Bug: 26320300

This reverts commit 288b1e9a0dddfb91e85067fe81de55174f313c7c.

Change-Id: Iccd05827b0630281b6f959331eaa4202526df78e

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 5c72629..98aa8d8 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -827,9 +827,13 @@
       const OatHeader& boot_oat_header = oat_file->GetOatHeader();
       const char* boot_cp = boot_oat_header.GetStoreValueByKey(OatHeader::kBootClassPath);
       if (boot_cp != nullptr) {
-        gc::space::ImageSpace::CreateMultiImageLocations(image_locations[0],
-                                                         boot_cp,
-                                                         &image_locations);
+        std::vector<std::string> cp;
+        Split(boot_cp, ':', &cp);
+
+        if (cp.size() > 1) {
+          // More images, enqueue (skipping the first).
+          image_locations.insert(image_locations.end(), cp.begin() + 1, cp.end());
+        }
       }
     }