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

am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

Browse Source 
* commit '9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
  Frameworks/base: Hand fingerprint to ART
This commit is contained in:
Andreas Gampe
2015-07-24 21:39:24 +00:00
committed by Android Git Automerger
parent 7385aca1a2 9a755e3650
commit 08edf246e9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/AndroidRuntime.cpp
View File

@@ -590,6 +590,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX]; char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX];
char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX]; char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];
char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX]; char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];
char fingerprintBuf[sizeof("-Xfingerprint:") + PROPERTY_VALUE_MAX];
bool checkJni = false; bool checkJni = false;
property_get("dalvik.vm.checkjni", propBuf, ""); property_get("dalvik.vm.checkjni", propBuf, "");
@@ -908,6 +909,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
addOption("--generate-debug-info"); 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.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray(); initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size(); initArgs.nOptions = mOptions.size();