commit 1175aec5f686b9e3d429282d7d4022c39436f71f
author Narayan Kamath <narayan@google.com> Thu Jul 31 16:56:26 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 29 22:52:28 2014 +0000
tree 0f80ac433f0ce17b3620b55c81af583787bf9a4a
parent 00d1ef41d0d0d438d604d102183a6bfac58643e7
parent 1a762136398ffa4ed2c366d344b45ca4244d6c6c

Merge "Fix image not regenerating on changes to bootclasspath"

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 883e1c1f..42089af 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -337,9 +337,11 @@
           relocated_version_used = true;
         } else {
           image_filename = &system_filename;
+          is_system = true;
         }
       } else if (has_system) {
         image_filename = &system_filename;
+        is_system = true;
       } else {
         CHECK(has_cache);
         image_filename = &cache_filename;
@@ -355,7 +357,7 @@
       LOG(INFO) << "Using image file " << image_filename->c_str() << " for image location "
                 << image_location;
       space = ImageSpace::Init(image_filename->c_str(), image_location,
-                               false, &error_msg);
+                               !is_system, &error_msg);
     }
     if (space != nullptr) {
       return space;