summaryrefslogtreecommitdiff
path: root/runtime/java_vm_ext.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2015-08-28 17:43:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-08-28 17:43:19 +0000
commitf0f73895c06a1ff157d7915b04c41f93a52936c2 (patch)
treef4936654805b4d84540bd909095e8bbf69795bfd /runtime/java_vm_ext.cc
parent85d97eaedba4b60ae4184883bce05d3a5d2604f5 (diff)
parent81a9087f0df0518c39405b7d18ba5858a6d8b77b (diff)
Merge "Revert "Change dex caches to be weak roots""
Diffstat (limited to 'runtime/java_vm_ext.cc')
-rw-r--r--runtime/java_vm_ext.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc
index 2fd0517061..9d41018c1b 100644
--- a/runtime/java_vm_ext.cc
+++ b/runtime/java_vm_ext.cc
@@ -373,7 +373,7 @@ JavaVMExt::JavaVMExt(Runtime* runtime, const RuntimeArgumentMap& runtime_options
globals_(gGlobalsInitial, gGlobalsMax, kGlobal),
libraries_(new Libraries),
unchecked_functions_(&gJniInvokeInterface),
- weak_globals_lock_("JNI weak global reference table lock", kJniWeakGlobalsLock),
+ weak_globals_lock_("JNI weak global reference table lock"),
weak_globals_(kWeakGlobalsInitial, kWeakGlobalsMax, kWeakGlobal),
allow_new_weak_globals_(true),
weak_globals_add_condition_("weak globals add condition", weak_globals_lock_) {