From 8899d5a90b99de482c864b416cc25363d1500d39 Mon Sep 17 00:00:00 2001
From: Ken Mixter <kmixter@google.com>
Date: Wed, 25 Aug 2010 09:17:38 -0700
Subject: [PATCH] Store away breakpad symbols in debug.tgz

BUG=5355

Change-Id: I1f6dff3808c5bfaf4b7ed6ba75e4d19b196d749c

Review URL: http://codereview.chromium.org/3166029
---
 archive_build.sh |  2 ++
 upload_symbols   | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/archive_build.sh b/archive_build.sh
index be082c2f19..7f7e53a3d4 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -230,6 +230,8 @@ gsutil_archive "${ZIPFILE}" "${LAST_CHANGE}/${FLAGS_zipname}"
 
 if [ $FLAGS_archive_debug -eq $FLAGS_TRUE ]
 then
+  echo "Generating Breakpad symbols"
+  ! ${SCRIPTS_DIR}/cros_generate_breakpad_symbols --board=${FLAGS_board}
   echo "Creating debug archive"
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/lib"
   sudo tar czf "${OUTDIR}/debug.tgz" --checkpoint=1000 --exclude\
diff --git a/upload_symbols b/upload_symbols
index d431eefcc3..71162a6637 100755
--- a/upload_symbols
+++ b/upload_symbols
@@ -22,8 +22,9 @@ get_default_board
 
 # Flags
 DEFINE_string board "$DEFAULT_BOARD" "The board to build packages for."
-DEFINE_boolean official_build $FLAGS_FALSE "Point to official symbol server."
-DEFINE_boolean regenerate $FLAGS_TRUE "Regenerate all symbols."
+DEFINE_string breakpad_root "" "Root directory for breakpad symbols."
+DEFINE_boolean official_build ${FLAGS_FALSE} "Point to official symbol server."
+DEFINE_boolean regenerate ${FLAGS_FALSE} "Regenerate all symbols."
 DEFINE_boolean verbose ${FLAGS_FALSE} "Be verbose."
 DEFINE_boolean yes ${FLAGS_FALSE} "Answer yes to all prompts."
 
@@ -99,13 +100,22 @@ function main() {
   fi
   info "Uploading symbols to ${upload_url} from ${SYSROOT}."
 
-  MINIDUMP_SYMBOLS_ROOT="${SYSROOT}/usr/lib/debug/breakpad"
+  DEFAULT_BREAKPAD_ROOT="${SYSROOT}/usr/lib/debug/breakpad"
+  if [ -z "${FLAGS_breakpad_root}" ]; then
+    FLAGS_breakpad_root="${DEFAULT_BREAKPAD_ROOT}"
+  else
+    if [ ${FLAGS_regenerate} -eq ${FLAGS_TRUE} ]; then
+      warn "Assuming --noregenerate when --breakpad_root is specified"
+      FLAGS_regenerate=${FLAGS_FALSE}
+    fi
+  fi
 
   if [ -z "${FLAGS_ARGV}" ]; then
-    really_upload || exit 1
     if [ ${FLAGS_regenerate} -eq ${FLAGS_TRUE} ]; then
-      sudo rm -rf "${MINIDUMP_SYMBOLS_ROOT}"
-      info "Generating all minidump symbol files."
+      really_upload || exit 1
+      info "Clearing ${DEFAULT_BREAKPAD_ROOT}"
+      sudo rm -rf "${DEFAULT_BREAKPAD_ROOT}"
+      info "Generating all breakpad symbol files."
       local verbosity=""
       local generate_script="$(dirname $0)/cros_generate_breakpad_symbols"
       [ ${FLAGS_verbose} -eq ${FLAGS_TRUE} ] && verbosity="--verbose"
@@ -115,8 +125,8 @@ function main() {
       fi
     fi
 
-    info "Uploading all minidump symbol files."
-    for sym_file in $(find "${MINIDUMP_SYMBOLS_ROOT}" -name \*.sym); do
+    info "Uploading all breakpad symbol files."
+    for sym_file in $(find "${FLAGS_breakpad_root}" -name \*.sym); do
       ! upload_file "${sym_file}" "${upload_url}"
     done
   else