commit 7c2730781b29289052b81c597b92eaa3d2730fe4
author android-build-team Robot <android-build-team-robot@google.com> Tue Dec 12 23:59:20 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Dec 12 23:59:20 2017 +0000
tree 352445566227357219fd53aa45b11ed0c5af82c1
parent 1ef03940ff8319a31aa280cd9947e74b77a91227
parent b6ea7dad7e5ef97632ca4cc110d686a048aa04af

Merge cherrypicks of [3353959] into oc-m3-release

Change-Id: Icdebab1c6a4525c5c971d59560b8aa6cfef0c010

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index fe0d35f..3aab4c6 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -1574,7 +1574,9 @@
     if (!Runtime::Current()->IsImageDex2OatEnabled()) {
       local_error_msg = "Patching disabled.";
     } else if (secondary_image) {
-      local_error_msg = "Cannot patch a secondary image.";
+      // We really want a working image. Prune and restart.
+      PruneDalvikCache(image_isa);
+      _exit(1);
     } else if (ImageCreationAllowed(is_global_cache, image_isa, &local_error_msg)) {
       bool patch_success =
           RelocateImage(image_location, cache_filename.c_str(), image_isa, &local_error_msg);