diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-30 17:53:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 17:53:51 +0000 |
| commit | fcda22b1fe33370922a53d6562aa15366818bd45 (patch) | |
| tree | ef354c053cc59828d3cd416f1c796b4164a6880b /core/jni | |
| parent | ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6 (diff) | |
| parent | 27c39f1adeaf1a653fb41a5af64ee815b8048dd6 (diff) | |
| download | frameworks_base-fcda22b1fe33370922a53d6562aa15366818bd45.zip frameworks_base-fcda22b1fe33370922a53d6562aa15366818bd45.tar.gz frameworks_base-fcda22b1fe33370922a53d6562aa15366818bd45.tar.bz2 | |
Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 88f0697..7c2b28d 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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(); |