Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems."

Browse Source
This commit is contained in:
Elliott Hughes
2011-07-06 18:11:20 -07:00
committed by Android (Google) Code Review
parent 269318760f ae07ecf376
commit ed61ee1fae
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Process.java
View File

@@ -522,6 +522,9 @@ public class Process {
argsForZygote.add("--runtime-init");
argsForZygote.add("--setuid=" + uid);
argsForZygote.add("--setgid=" + gid);
if ((debugFlags & Zygote.DEBUG_ENABLE_JNI_LOGGING) != 0) {
argsForZygote.add("--enable-jni-logging");
}
if ((debugFlags & Zygote.DEBUG_ENABLE_SAFEMODE) != 0) {
argsForZygote.add("--enable-safemode");
}

6
core/java/com/android/internal/os/ZygoteConnection.java
View File

@@ -328,8 +328,8 @@ class ZygoteConnection {
boolean peerWait;
/**
* From --enable-debugger, --enable-checkjni, --enable-assert, and
* --enable-safemode
* From --enable-debugger, --enable-checkjni, --enable-assert,
* --enable-safemode, and --enable-jni-logging.
*/
int debugFlags;
@@ -408,6 +408,8 @@ class ZygoteConnection {
debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE;
} else if (arg.equals("--enable-checkjni")) {
debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
} else if (arg.equals("--enable-jni-logging")) {
debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;
} else if (arg.equals("--enable-assert")) {
debugFlags |= Zygote.DEBUG_ENABLE_ASSERT;
} else if (arg.equals("--peer-wait")) {