diff options
| author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-06 19:30:12 -0600 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-06 19:32:30 -0600 |
| commit | 58d4793f8bd82b9daab5bf4fa40d5b68204e71eb (patch) | |
| tree | 449265cbacbf925f37ed0bd201e68f080e2537cc /runtime/base/mutex.h | |
| parent | 20af13267def46b2e5f9a6fa6e94ac69056ef16f (diff) | |
| parent | 12eb0c532e33ca5d5e98addd580b5ad0a4b71be4 (diff) | |
| download | art-58d4793f8bd82b9daab5bf4fa40d5b68204e71eb.tar.gz art-58d4793f8bd82b9daab5bf4fa40d5b68204e71eb.tar.bz2 art-58d4793f8bd82b9daab5bf4fa40d5b68204e71eb.zip | |
Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebase
Android 7.1.1 release 4
Change-Id: I14b36666b5a478024f3a9ffab90fd675a6157461
Diffstat (limited to 'runtime/base/mutex.h')
| -rw-r--r-- | runtime/base/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 3d7624d979..a4e05bd5b7 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -88,7 +88,6 @@ enum LockLevel { kTracingUniqueMethodsLock, kTracingStreamingLock, kDeoptimizedMethodsLock, - kJitCodeCacheLock, kClassLoaderClassesLock, kDefaultMutexLevel, kMarkSweepLargeObjectLock, @@ -99,6 +98,7 @@ enum LockLevel { kMonitorPoolLock, kMethodVerifiersLock, kClassLinkerClassesLock, // TODO rename. + kJitCodeCacheLock, kBreakpointLock, kMonitorLock, kMonitorListLock, |