diff options
| author | 2019-06-27 07:54:48 +0000 | |
|---|---|---|
| committer | 2019-06-27 08:16:04 +0000 | |
| commit | b476a29a2cda22b86fc1d96e4cc65ce36fb878af (patch) | |
| tree | 039eaee2edf5495275088d1c467e522977c6bcd6 /runtime/runtime.cc | |
| parent | 3b2905366c6ee1eaba2d6477078e505e377343ec (diff) | |
Revert "Support using opaque JNI ids"
This reverts commit 21d5994583c679cd5d8573b5d35dbd659bdca2c7.
Bug: 134162467
Reason for revert: Breaks debuggable
Change-Id: I9510a6ac208d392ff25ee196a1a519fecd151445
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index ad20575af7..12fda4382b 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -94,9 +94,7 @@ #include "jit/jit_code_cache.h" #include "jit/profile_saver.h" #include "jni/java_vm_ext.h" -#include "jni/jni_id_manager.h" #include "jni/jni_internal.h" -#include "jni_id_type.h" #include "linear_alloc.h" #include "memory_representation.h" #include "mirror/array.h" @@ -1183,8 +1181,6 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { oat_file_manager_ = new OatFileManager; - jni_id_manager_ = new jni::JniIdManager; - Thread::SetSensitiveThreadHook(runtime_options.GetOrDefault(Opt::HookIsSensitiveThread)); Monitor::Init(runtime_options.GetOrDefault(Opt::LockProfThreshold), runtime_options.GetOrDefault(Opt::StackDumpLockProfThreshold)); @@ -1306,13 +1302,6 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { is_low_memory_mode_ = runtime_options.Exists(Opt::LowMemoryMode); madvise_random_access_ = runtime_options.GetOrDefault(Opt::MadviseRandomAccess); - if (!runtime_options.Exists(Opt::OpaqueJniIds)) { - jni_ids_indirection_ = JniIdType::kDefault; - } else { - jni_ids_indirection_ = *runtime_options.Get(Opt::OpaqueJniIds) ? JniIdType::kIndices - : JniIdType::kPointer; - } - plugins_ = runtime_options.ReleaseOrDefault(Opt::Plugins); agent_specs_ = runtime_options.ReleaseOrDefault(Opt::AgentPath); // TODO Add back in -agentlib |