diff options
Diffstat (limited to 'runtime/image.h')
| -rw-r--r-- | runtime/image.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/image.h b/runtime/image.h index 88bba13e19..46260552db 100644 --- a/runtime/image.h +++ b/runtime/image.h @@ -222,10 +222,6 @@ class PACKED(8) ImageHeader { enum ImageRoot { kDexCaches, kClassRoots, - kOomeWhenThrowingException, // Pre-allocated OOME when throwing exception. - kOomeWhenThrowingOome, // Pre-allocated OOME when throwing OOME. - kOomeWhenHandlingStackOverflow, // Pre-allocated OOME when handling StackOverflowError. - kNoClassDefFoundError, // Pre-allocated NoClassDefFoundError. kSpecialRoots, // Different for boot image and app image, see aliases below. kImageRootsMax, @@ -234,6 +230,15 @@ class PACKED(8) ImageHeader { kBootImageLiveObjects = kSpecialRoots, // Array of boot image objects that must be kept live. }; + enum BootImageLiveObjects { + kOomeWhenThrowingException, // Pre-allocated OOME when throwing exception. + kOomeWhenThrowingOome, // Pre-allocated OOME when throwing OOME. + kOomeWhenHandlingStackOverflow, // Pre-allocated OOME when handling StackOverflowError. + kNoClassDefFoundError, // Pre-allocated NoClassDefFoundError. + kClearedJniWeakSentinel, // Pre-allocated sentinel for cleared weak JNI references. + kIntrinsicObjectsStart + }; + /* * This describes the number and ordering of sections inside of Boot * and App Images. It is very important that changes to this struct |