summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-07-24 14:19:44 -0700
committerAndreas Gampe <agampe@google.com>2015-07-24 14:19:44 -0700
commite60825033fdde9eefaeec768a28b907e2d22f10c (patch)
treee93f19ba8e2a2e0502de5159b350d2fc75f93142 /core/jni
parentcc855ad737e61fc02a057e811f2e6e34bbff0e37 (diff)
downloadframeworks_base-e60825033fdde9eefaeec768a28b907e2d22f10c.zip
frameworks_base-e60825033fdde9eefaeec768a28b907e2d22f10c.tar.gz
frameworks_base-e60825033fdde9eefaeec768a28b907e2d22f10c.tar.bz2
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build fingerprint to the runtime. Bug: 22693991 Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/AndroidRuntime.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index bffbab7..bae2cde 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -590,6 +590,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX];
char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];
char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];
+ char fingerprintBuf[sizeof("-Xfingerprint:") + PROPERTY_VALUE_MAX];
bool checkJni = false;
property_get("dalvik.vm.checkjni", propBuf, "");
@@ -908,6 +909,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
addOption("--generate-debug-info");
}
+ /*
+ * Retrieve the build fingerprint and provide it to the runtime. That way, ANR dumps will
+ * contain the fingerprint and can be parsed.
+ */
+ parseRuntimeOption("ro.build.fingerprint", fingerprintBuf, "-Xfingerprint:");
+
initArgs.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size();