From a9d1f1f2994361b6d26d8c492ea0070358f6a621 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Fri, 18 Jul 2014 17:58:36 +0000 Subject: [PATCH] Cherry pick r1351 into chrome_37 branch. Original commit message: [Android]: Remove __system_property_get(ro.build.fingerprint) from WriteOSInformation. __system_property_get has been removed from the Android NDK for 'L' so Breakpad no longer links. This CL just removes the call in WriteOSInformation because Chrome already passes the build fingerprint as a crash key called "android_build_fp" in the crash report HTTP POST message. BUG=394841,393903 R=mark@chromium.org git-svn-id: http://google-breakpad.googlecode.com/svn/branches/chrome_37@1353 4c0a9323-5329-0410-9bdc-e9ce6186880e --- .../linux/minidump_writer/minidump_writer.cc | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc index 43c1ef2c..fa2ad9e1 100644 --- a/src/client/linux/minidump_writer/minidump_writer.cc +++ b/src/client/linux/minidump_writer/minidump_writer.cc @@ -1758,23 +1758,6 @@ 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) - my_strlcat(buf, separator, sizeof(buf)); - my_strlcat(buf, fingerprint, sizeof(buf)); - } -#endif - MDLocationDescriptor location; if (!minidump_writer_.WriteString(buf, 0, &location)) return false;