aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux/minidump_writer
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/linux/minidump_writer')
-rw-r--r--src/client/linux/minidump_writer/minidump_writer.cc24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc
index 35a291db..209e1720 100644
--- a/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/src/client/linux/minidump_writer/minidump_writer.cc
@@ -53,6 +53,9 @@
#include <link.h>
#endif
#include <stdio.h>
+#if defined(__ANDROID__)
+#include <sys/system_properties.h>
+#endif
#if !defined(__ANDROID__)
#include <sys/ucontext.h>
#include <sys/user.h>
@@ -1246,7 +1249,11 @@ class MinidumpWriter {
}
bool WriteOSInformation(MDRawSystemInfo* sys_info) {
+#if defined(__ANDROID__)
+ sys_info->platform_id = MD_OS_ANDROID;
+#else
sys_info->platform_id = MD_OS_LINUX;
+#endif
struct utsname uts;
if (uname(&uts))
@@ -1283,6 +1290,23 @@ class MinidumpWriter {
space_left -= info_len;
}
+#ifdef __ANDROID__
+ // On Android, try to get the build fingerprint and append it.
+ // Fail gracefully because there is no guarantee that the system
+ // property will always be available or accessible.
+ char fingerprint[PROP_VALUE_MAX];
+ int fingerprint_len = __system_property_get("ro.build.fingerprint",
+ fingerprint);
+ // System property values shall always be zero-terminated.
+ // Be paranoid and don't trust the system.
+ if (fingerprint_len > 0 && fingerprint_len < PROP_VALUE_MAX) {
+ const char* separator = " ";
+ if (!first_item)
+ strlcat(buf, separator, buf_len);
+ strlcat(buf, fingerprint, buf_len);
+ }
+#endif
+
MDLocationDescriptor location;
if (!minidump_writer_.WriteString(buf, 0, &location))
return false;