diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-13 21:48:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-13 21:48:14 +0000 |
| commit | 53fcdf163a31e1af3a32af503afcd78d99f0c0ce (patch) | |
| tree | 352445566227357219fd53aa45b11ed0c5af82c1 | |
| parent | 38a95a9cd6cf4829f7b6d3362e83e49a053b731e (diff) | |
| parent | d1418798048a23cdf1336699f7c81ba077728be5 (diff) | |
| download | art-53fcdf163a31e1af3a32af503afcd78d99f0c0ce.tar.gz | |
Merge cherrypicks of [3360818] into oc-mr1-releaseandroid-wear-8.1.0_r1android-8.1.0_r6android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-wear-releaseoreo-mr1-s1-releaseoreo-mr1-release
Change-Id: Ic02449412cbb9580b91b7174650150121414a230
| -rw-r--r-- | runtime/gc/space/image_space.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index fe0d35f455..3aab4c6bba 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -1574,7 +1574,9 @@ std::unique_ptr<ImageSpace> ImageSpace::CreateBootImage(const char* image_locati 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); |