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

resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

Browse Source 
Change-Id: I0e3dacbdfb68d6bb31800ff2e9969b96e63634b6
This commit is contained in:
Andreas Gampe
2015-04-27 10:18:08 -07:00
parent 838a99e9ad c29791d56a
commit b6d14a009e
5 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,6 +634,9 @@ 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_ENABLE_ASSERT) != 0) {
argsForZygote.add("--enable-assert");
}

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

@@ -40,6 +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;
/** No external storage should be mounted. */
public static final int MOUNT_EXTERNAL_NONE = 0;

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

@@ -321,7 +321,7 @@ class ZygoteConnection {
/**
* From --enable-debugger, --enable-checkjni, --enable-assert,
* --enable-safemode, --enable-jit, and --enable-jni-logging.
* --enable-safemode, --enable-jit, --generate-cfi and --enable-jni-logging.
*/
int debugFlags;
@@ -433,6 +433,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("--enable-jni-logging")) {
debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;
} else if (arg.equals("--enable-assert")) {

13
core/jni/AndroidRuntime.cpp
View File

@@ -875,6 +875,19 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
parseRuntimeOption("dalvik.vm.zygote.max-boot-retry", cachePruneBuf,
"-Xzygote-max-boot-retry=");
/*
* 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.
*/
property_get("debug.gencfi", propBuf, "");
if (strcmp(propBuf, "true") == 0) {
addOption("-Xcompiler-option");
addOption("--include-cfi");
addOption("-Ximage-compiler-option");
addOption("--include-cfi");
}
initArgs.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size();

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

@@ -3173,6 +3173,10 @@ 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;
}
if ("1".equals(SystemProperties.get("debug.jni.logging"))) {
debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;
}