summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-07-24 14:19:44 -0700
committer Andreas Gampe <agampe@google.com> 2015-07-24 15:37:39 -0700
commit1f105a6b27f7b4036a559482a2341ab85a4719a5 (patch)
treef85e90455a970929519f1e525b3ec73d45999484
parent86d5fc2874b4c17bd4f48ae307e49ba8108e11f0 (diff)
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build fingerprint to the runtime. Bug: 22693991 (cherry picked from commit e60825033fdde9eefaeec768a28b907e2d22f10c) Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
-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 6cc2cabf9189..7e7b74a2d5d5 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -589,6 +589,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, "");
@@ -906,6 +907,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();