Update breakpad prebuiltsstudio-4.1.1studio-4.1.0studio-4.0.0studio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3studio-2.0-rc1studio-2.0gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0gradle_2.0.0studio-master-devmirror-goog-studio-master-dev

main difference: they are now built with
MINIMUM_SEVERITY=SEVERITY_ERROR to reduce stderr noise.

Change-Id: I047302a46ef01ea49cf344d3bf71c6b748f39a3b

24 files changed, 83 insertions, 61 deletions

diff --git a/Breakpad.framework/Breakpad b/Breakpad.framework/Breakpad
index 9be7d40..81df92a 100755
--- a/Breakpad.framework/Breakpad
+++ b/Breakpad.framework/Breakpad
diff --git a/Breakpad.framework/Resources/Info.plist b/Breakpad.framework/Resources/Info.plist
index 0464ee9..7f1a475 100644
--- a/Breakpad.framework/Resources/Info.plist
+++ b/Breakpad.framework/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -23,7 +23,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -31,8 +31,8 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 </dict>
 </plist>
diff --git a/Breakpad.framework/Resources/Inspector b/Breakpad.framework/Resources/Inspector
index 78a40ac..beda0d8 100755
--- a/Breakpad.framework/Resources/Inspector
+++ b/Breakpad.framework/Resources/Inspector
diff --git a/Breakpad.framework/Resources/breakpadUtilities.dylib b/Breakpad.framework/Resources/breakpadUtilities.dylib
index fbe1474..ab67a0e 100755
--- a/Breakpad.framework/Resources/breakpadUtilities.dylib
+++ b/Breakpad.framework/Resources/breakpadUtilities.dylib
diff --git a/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist b/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist
index 9136337..ba5ba8f 100644
--- a/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist
+++ b/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -35,9 +35,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>LSHasLocalizedDisplayName</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
index 54b795c..125907f 100755
--- a/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
+++ b/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
diff --git a/Breakpad.framework/Versions/A/Breakpad b/Breakpad.framework/Versions/A/Breakpad
index 9be7d40..81df92a 100755
--- a/Breakpad.framework/Versions/A/Breakpad
+++ b/Breakpad.framework/Versions/A/Breakpad
diff --git a/Breakpad.framework/Versions/A/Resources/Info.plist b/Breakpad.framework/Versions/A/Resources/Info.plist
index 0464ee9..7f1a475 100644
--- a/Breakpad.framework/Versions/A/Resources/Info.plist
+++ b/Breakpad.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -23,7 +23,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -31,8 +31,8 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 </dict>
 </plist>
diff --git a/Breakpad.framework/Versions/A/Resources/Inspector b/Breakpad.framework/Versions/A/Resources/Inspector
index 78a40ac..beda0d8 100755
--- a/Breakpad.framework/Versions/A/Resources/Inspector
+++ b/Breakpad.framework/Versions/A/Resources/Inspector
diff --git a/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib b/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib
index fbe1474..ab67a0e 100755
--- a/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib
+++ b/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib
diff --git a/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist b/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist
index 9136337..ba5ba8f 100644
--- a/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist
+++ b/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -35,9 +35,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>LSHasLocalizedDisplayName</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
index 54b795c..125907f 100755
--- a/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
+++ b/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
diff --git a/Breakpad.framework/Versions/Current/Breakpad b/Breakpad.framework/Versions/Current/Breakpad
index 9be7d40..81df92a 100755
--- a/Breakpad.framework/Versions/Current/Breakpad
+++ b/Breakpad.framework/Versions/Current/Breakpad
diff --git a/Breakpad.framework/Versions/Current/Resources/Info.plist b/Breakpad.framework/Versions/Current/Resources/Info.plist
index 0464ee9..7f1a475 100644
--- a/Breakpad.framework/Versions/Current/Resources/Info.plist
+++ b/Breakpad.framework/Versions/Current/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -23,7 +23,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -31,8 +31,8 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 </dict>
 </plist>
diff --git a/Breakpad.framework/Versions/Current/Resources/Inspector b/Breakpad.framework/Versions/Current/Resources/Inspector
index 78a40ac..beda0d8 100755
--- a/Breakpad.framework/Versions/Current/Resources/Inspector
+++ b/Breakpad.framework/Versions/Current/Resources/Inspector
diff --git a/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib b/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib
index fbe1474..ab67a0e 100755
--- a/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib
+++ b/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib
diff --git a/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist b/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist
index 9136337..ba5ba8f 100644
--- a/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist
+++ b/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -35,9 +35,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0611</string>
+	<string>0620</string>
 	<key>DTXcodeBuild</key>
-	<string>6A2008a</string>
+	<string>6C131e</string>
 	<key>LSHasLocalizedDisplayName</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
index 54b795c..125907f 100755
--- a/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
+++ b/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender
diff --git a/bin/dump_syms b/bin/dump_syms
index c976129..fba8a06 100755
--- a/bin/dump_syms
+++ b/bin/dump_syms
diff --git a/bin/microdump_stackwalk b/bin/microdump_stackwalk
index b5f10f5..fc4ffca 100755
--- a/bin/microdump_stackwalk
+++ b/bin/microdump_stackwalk
diff --git a/bin/minidump_dump b/bin/minidump_dump
index d91074b..9422ea7 100755
--- a/bin/minidump_dump
+++ b/bin/minidump_dump
diff --git a/bin/minidump_stackwalk b/bin/minidump_stackwalk
index 749467b..15f6470 100755
--- a/bin/minidump_stackwalk
+++ b/bin/minidump_stackwalk
diff --git a/build-breakpad.sh b/build-breakpad.sh
index cb84f27..7f522ca 100755
--- a/build-breakpad.sh
+++ b/build-breakpad.sh
@@ -15,7 +15,7 @@ build_and_install_MSVC()
 
         $RD/gyp/gyp --no-circular-check --no-duplicate-basename-check $solution.gyp
         (
-                export CL="/I \"$VS120COMNTOOLS\\..\\..\\DIA SDK\\include\""
+                export CL="/DBPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR \"$VS120COMNTOOLS\\..\\..\\DIA SDK\\include\""
                 _CL_="/MDd /WX-" devenv $solution.sln /Build Debug $project_switch
                 _CL_="/MD /WX-" devenv $solution.sln /Build Release $project_switch
         )
@@ -29,6 +29,9 @@ build_and_install_configure()
 {
         mkdir $RD/build
         cd $RD/build
+        local defines="-DBPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR"
+        export CFLAGS="$CFLAGS $defines"
+        export CXXFLAGS="$CXXFLAGS $defines"
         ../sources/configure --prefix=/
         make -j$CORES
         make install-strip DESTDIR=$INSTALL
@@ -48,7 +51,7 @@ GYP_VER=265f495c
 
 MSVS=2013
 
-source $(dirname "$0")/build-common.sh build-common.sh
+source $(dirname "$0")/build-common.sh "$@"
 
 git clone https://chromium.googlesource.com/breakpad/breakpad --no-checkout sources
 cd sources
@@ -128,4 +131,4 @@ case "$OS" in
 	;;
 esac
 
-commit_and_push
+finalize_build
diff --git a/build-common.sh b/build-common.sh
index ed3914d..e25bfc9 100755
--- a/build-common.sh
+++ b/build-common.sh
@@ -4,29 +4,69 @@
 # inputs
 # $PROJ - project name
 # $VER - project version
-# $1 - name of this file
+# $1 - (temporary) output directory
+# $2 - build directory for build artefacts
+# $3 - build number
 #
 # this file does the following:
 #
 # 1) define the following env vars
 #    OS - linux|darwin|windows
-#    USER - username
 #    CORES - numer of cores (for parallel builds)
 #    PATH (with appropriate compilers)
 #    CFLAGS/CXXFLAGS/LDFLAGS
 #    RD - root directory for source and object files
-#    INSTALL - install directory/git repo root
+#    INSTALL - install directory
 #    SCRIPT_FILE - absolute path to the parent build script
 #    SCRIPT_DIR - absolute path to the parent build script's directory
 #    COMMON_FILE - absolute path to this file
-# 2) create an empty tmp directory at /tmp/$PROJ-$USER
-# 3) checkout the destination git repo to /tmp/prebuilts/$PROJ/$OS-x86/$VER
-# 4) cd $RD
+# 2) cd $RD
+#
+# after placing all your build products into $INSTALL you should call finalize_build to produce
+# the final build artifact
+
+# exit on error
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd -P)"
+SCRIPT_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[1]}")"
+COMMON_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[0]}")"
+
+# calculate the root directory from the script path
+# this script lives three directories down from the root
+# external/lldb-utils/prebuilts/build-common.sh
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
+cd "$ROOT_DIR"
+
+function die() {
+	echo "$*" > /dev/stderr
+	echo "Usage: $0 <out_dir> <dest_dir> <build_number>" > /dev/stderr
+	exit 1
+}
+
+(($# > 3)) && die "[$0] Unknown parameter: $4"
+
+OUT="$1"
+DEST="$2"
+BNUM="$3"
+
+[ ! "$OUT"  ] && die "## Error: Missing out folder"
+[ ! "$DEST" ] && die "## Error: Missing destination folder"
+[ ! "$BNUM" ] && die "## Error: Missing build number"
+
+mkdir -p "$OUT" "$DEST"
+OUT="$(cd "$OUT" && pwd -P)"
+DEST="$(cd "$DEST" && pwd -P)"
+
+cat <<END_INFO
+## Building $PROJ ##
+## Out Dir  : $OUT
+## Dest Dir : $DEST
+## Build Num: $BNUM
+
+END_INFO
 
 UNAME="$(uname)"
-if [ -z "$BUILD_SCRATCH" ]; then
-    BUILD_SCRATCH=/tmp
-fi
 UPSTREAM=sso://googleplex-android/platform/prebuilts
 case "$UNAME" in
 Linux)
@@ -44,7 +84,6 @@ Darwin)
     INSTALL_VER=$VER
     ;;
 *_NT-*)
-    USER=$USERNAME
     OS='windows'
     CORES=$NUMBER_OF_PROCESSORS
     # VS2013 x64 Native Tools Command Prompt
@@ -68,13 +107,9 @@ Darwin)
     ;;
 esac
 
-RD=$BUILD_SCRATCH/$PROJ-$USER
+RD=$OUT/$PROJ
 INSTALL="$RD/install"
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd -P)"
-SCRIPT_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[1]}")"
-COMMON_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[0]}")"
-
 cd /tmp # windows can't delete if you're in the dir
 rm -rf $RD
 mkdir -p $INSTALL
@@ -107,23 +142,7 @@ linux)
     ;;
 esac
 
-commit_and_push()
-{
-    BRANCH=lldb-master-dev
-    # check into a local git clone
-    rm -rf $BUILD_SCRATCH/prebuilts/$PROJ/
-    GIT_REPO="$BUILD_SCRATCH/prebuilts/$PROJ/$OS-x86"
-    mkdir -p "$GIT_REPO"
-    cd $GIT_REPO
-    rm -rf *
-    mv $INSTALL/* $GIT_REPO
-    cp $SCRIPT_FILE $GIT_REPO
-    cp $COMMON_FILE $GIT_REPO
-
-    zip -r --symlinks "$BUILD_SCRATCH/breakpad.zip" .
-
-    # execute this command to upload
-    #git push origin HEAD:refs/for/$BRANCH
-
-    rm -rf $RD
+function finalize_build() {
+    cp "$SCRIPT_FILE" "$COMMON_FILE" "$INSTALL"
+    (cd "$INSTALL" && zip --symlinks -r "$DEST/$PROJ-$BNUM.zip" .)
 }