Add package field to Android crash reports

components/crash/content/app/breakpad_linux.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // For linux_syscall_support.h. This makes it safe to call embedded system
 // calls when in seccomp mode.
 
 #include "components/crash/content/app/breakpad_linux.h"
 
 #include <fcntl.h>
@@ skipping 40 matching lines @@
 #include "components/crash/core/common/crash_keys.h"
 #include "content/public/common/content_descriptors.h"
 
 #if defined(OS_ANDROID)
 #include <android/log.h>
 #include <sys/stat.h>
 
 #include "base/android/build_info.h"
 #include "base/android/path_utils.h"
 #include "base/debug/leak_annotations.h"
+#include "base/strings/stringprintf.h"
 #endif
 #include "third_party/lss/linux_syscall_support.h"
 
 #if defined(ADDRESS_SANITIZER)
 #include <ucontext.h>  // for getcontext().
 #endif
 
 #if defined(OS_ANDROID)
 #define STAT_STRUCT struct stat
 #define FSTAT_FUNC fstat
@@ skipping 64 matching lines @@
   base::ThreadChecker thread_checker_;
   const char* microdump_build_fingerprint_;
   const char* microdump_product_info_;
   const char* microdump_gpu_fingerprint_;
   const char* microdump_process_type_;
 };
 
 base::LazyInstance<MicrodumpInfo> g_microdump_info =
     LAZY_INSTANCE_INITIALIZER;
 
+// Creates the value for the "package" field, which is in the format:
+// $PACKAGE_NAME v$VERSION_CODE ($VERSION_NAME)
+std::string format_android_package(

[Lei Zhang, 2016/12/08 06:53:50]

nit: FormatAndroidPackage() ?

[agrieve, 2016/12/13 18:47:45]

Done.

+    base::android::BuildInfo* android_build_info) {
+  return base::StringPrintf("%s v%s (%s)",

[Lei Zhang, 2016/12/08 06:53:50]

This file has "WARNING: this code runs in a compromised context. It may not call
into libc nor allocate memory normally." in a few places, and it applies to this
code's caller. HandleCrashDump() does not have this comment, but it declares a
google_breakpad::PageAllocator which gives it away.

I would try using my_strlcat() and my_strlcpy() to clobber together a buffer on
the stack, or use google_breakpad::PageAllocator to allocate memory. There's a
couple examples in this file.

Back to winter hibernation...

[agrieve, 2016/12/13 18:47:45]

Aha, great info! Put it on the stack.

+                            android_build_info->package_name(),
+                            android_build_info->package_version_code(),
+                            android_build_info->package_version_name());
+}
 #endif
 
 CrashKeyStorage* g_crash_keys = nullptr;
 
 // Writes the value |v| as 16 hex characters to the memory pointed at by
 // |output|.
 void write_uint64_hex(char* output, uint64_t v) {
   static const char hextable[] = "0123456789abcdef";
 
   for (int i = 15; i >= 0; --i) {
@@ skipping 1448 matching lines @@
     }
 #if defined(OS_ANDROID)
     // Addtional MIME blocks are added for logging on Android devices.
     static const char android_build_id[] = "android_build_id";
     static const char android_build_fp[] = "android_build_fp";
     static const char device[] = "device";
     static const char gms_core_version[] = "gms_core_version";
     static const char model[] = "model";
     static const char brand[] = "brand";
     static const char exception_info[] = "exception_info";
+    static const char package[] = "package";
 
     base::android::BuildInfo* android_build_info =
         base::android::BuildInfo::GetInstance();
     writer.AddPairString(
         android_build_id, android_build_info->android_build_id());
     writer.AddBoundary();
     writer.AddPairString(
         android_build_fp, android_build_info->android_build_fp());
     writer.AddBoundary();
     writer.AddPairString(device, android_build_info->device());
     writer.AddBoundary();
     writer.AddPairString(model, android_build_info->model());
     writer.AddBoundary();
     writer.AddPairString(brand, android_build_info->brand());
     writer.AddBoundary();
     writer.AddPairString(gms_core_version,
         android_build_info->gms_version_code());
     writer.AddBoundary();
+    std::string android_package = format_android_package(android_build_info);
+    writer.AddPairString(package, android_package.c_str());
+    writer.AddBoundary();
     if (android_build_info->java_exception_info() != nullptr) {
       writer.AddPairString(exception_info,
                            android_build_info->java_exception_info());
       writer.AddBoundary();
     }
 #endif
     writer.Flush();
   }
 
   if (info.process_start_time > 0) {
@@ skipping 293 matching lines @@
     const std::string& gpu_fingerprint) {
   g_microdump_info.Get().SetGpuFingerprint(gpu_fingerprint);
 }
 #endif  // OS_ANDROID
 
 bool IsCrashReporterEnabled() {
   return g_is_crash_reporter_enabled;
 }
 
 }  // namespace breakpad