diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-17 11:09:10 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-08 08:29:53 -0700 |
| commit | 68d8b42ddec39ec0174162d90d4abaa004d1983e (patch) | |
| tree | 0bb6ccf3b996bb8363c10d07aa39cde221980602 /runtime/native/dalvik_system_ZygoteHooks.cc | |
| parent | 9c522c2cbbf50dc687728747b37ad59985750b65 (diff) | |
| download | android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.gz android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.bz2 android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.zip | |
Wire up check JNI force copy mode.
Increase check JNI checks.
Break apart jni_internal.h in to jni_env_ext.h and java_vm_ext.h.
Fix the abuse of ScopedObjectAccess/annotalysis by ScopedCheck in the case
of VM routines.
Make class loader override and shared library class loader JNI global
references rather than mirror pointers.
Clean-ups to native bridge.
Change-Id: If7c6110b5aade7a402bfb67534af86a7b2cdeb55
Diffstat (limited to 'runtime/native/dalvik_system_ZygoteHooks.cc')
| -rw-r--r-- | runtime/native/dalvik_system_ZygoteHooks.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index 820bd0420f..df6055dac3 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -17,6 +17,7 @@ #include <stdlib.h> #include "debugger.h" +#include "java_vm_ext.h" #include "jni_internal.h" #include "JNIHelp.h" #include "thread-inl.h" @@ -47,7 +48,7 @@ static void EnableDebugger() { } static void EnableDebugFeatures(uint32_t debug_flags) { - // Must match values in dalvik.system.Zygote. + // Must match values in com.android.internal.os.Zygote. enum { DEBUG_ENABLE_DEBUGGER = 1, DEBUG_ENABLE_CHECKJNI = 1 << 1, @@ -59,7 +60,7 @@ static void EnableDebugFeatures(uint32_t debug_flags) { if ((debug_flags & DEBUG_ENABLE_CHECKJNI) != 0) { Runtime* runtime = Runtime::Current(); JavaVMExt* vm = runtime->GetJavaVM(); - if (!vm->check_jni) { + if (!vm->IsCheckJniEnabled()) { LOG(INFO) << "Late-enabling -Xcheck:jni"; vm->SetCheckJniEnabled(true); // There's only one thread running at this point, so only one JNIEnv to fix up. |