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

am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."

Browse Source 
* commit '3976a56904e359eb975395725e908122d7d6e466':
  Replace --include-cfi with --generate-debug-info.
This commit is contained in:
David Srbecky
2015-05-28 18:45:36 +00:00
committed by Android Git Automerger
parent b8e100d7a4 3976a56904
commit efe01cc62e
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,8 +634,8 @@ public class Process {
if ((debugFlags & Zygote.DEBUG_ENABLE_JIT) != 0) {
argsForZygote.add("--enable-jit");
}
if ((debugFlags & Zygote.DEBUG_GENERATE_CFI) != 0) {
argsForZygote.add("--generate-cfi");
if ((debugFlags & Zygote.DEBUG_GENERATE_DEBUG_INFO) != 0) {
argsForZygote.add("--generate-debug-info");
}
if ((debugFlags & Zygote.DEBUG_ENABLE_ASSERT) != 0) {
argsForZygote.add("--enable-assert");

4
core/java/com/android/internal/os/Zygote.java
View File

@@ -40,8 +40,8 @@ public final class Zygote {
public static final int DEBUG_ENABLE_JNI_LOGGING = 1 << 4;
/** enable the JIT compiler */
public static final int DEBUG_ENABLE_JIT = 1 << 5;
/** Force generation of CFI code */
public static final int DEBUG_GENERATE_CFI = 1 << 6;
/** Force generation of native debugging information. */
public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 6;
/** No external storage should be mounted. */

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

@@ -322,7 +322,7 @@ class ZygoteConnection {
/**
* From --enable-debugger, --enable-checkjni, --enable-assert,
* --enable-safemode, --enable-jit, --generate-cfi and --enable-jni-logging.
* --enable-safemode, --enable-jit, --generate-debug-info and --enable-jni-logging.
*/
int debugFlags;
@@ -434,8 +434,8 @@ class ZygoteConnection {
debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
} else if (arg.equals("--enable-jit")) {
debugFlags |= Zygote.DEBUG_ENABLE_JIT;
} else if (arg.equals("--generate-cfi")) {
debugFlags |= Zygote.DEBUG_GENERATE_CFI;
} else if (arg.equals("--generate-debug-info")) {
debugFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;
} else if (arg.equals("--enable-jni-logging")) {
debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;
} else if (arg.equals("--enable-assert")) {

12
core/jni/AndroidRuntime.cpp
View File

@@ -874,16 +874,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
addOption(cpuAbiListBuf);
/*
* When running with debug.gencfi, add --include-cfi to the compiler options so that the boot
* image, if it is compiled on device, will include CFI info, as well as other compilations
* started by the runtime.
* When running with debug.generate-debug-info, add --generate-debug-info to
* the compiler options so that the boot image, if it is compiled on device,
* will include native debugging information.
*/
property_get("debug.gencfi", propBuf, "");
property_get("debug.generate-debug-info", propBuf, "");
if (strcmp(propBuf, "true") == 0) {
addOption("-Xcompiler-option");
addOption("--include-cfi");
addOption("--generate-debug-info");
addOption("-Ximage-compiler-option");
addOption("--include-cfi");
addOption("--generate-debug-info");
}
initArgs.version = JNI_VERSION_1_4;

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3017,9 +3017,9 @@ public final class ActivityManagerService extends ActivityManagerNative
debugFlags |= Zygote.DEBUG_ENABLE_JIT;
}
}
String genCFIDebugProperty = SystemProperties.get("debug.gencfi");
if ("true".equals(genCFIDebugProperty)) {
debugFlags |= Zygote.DEBUG_GENERATE_CFI;
String genDebugInfoProperty = SystemProperties.get("debug.generate-debug-info");
if ("true".equals(genDebugInfoProperty)) {
debugFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;
}
if ("1".equals(SystemProperties.get("debug.jni.logging"))) {
debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;