Address review comments for r322149 (package script for instrumented libs).

third_party/instrumented_libraries/scripts/build_and_package.sh

 #!/bin/bash
 # Copyright 2015 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.
 
 set -eu
 
 supported_build_types="msan-no-origins msan-chained-origins"
 supported_releases="precise trusty"
 ubuntu_release=$(lsb_release -cs)
@@ skipping 12 matching lines @@
     "msan-no-origins")
       local gyp_defines="msan=1 msan_track_origins=0"
       ;;
     *)
       show_help
       exit 1
       ;;
   esac
   
   local archive_name=${build_type}-${ubuntu_release}
-  local out_dir=out_${archive_name}
+  local out_dir=out-${archive_name}
 
   echo "Building instrumented libraries in ${out_dir}..."
 
   rm -rf $out_dir
   mkdir $out_dir
 
-  GYP_DEFINES="${gyp_defines} use_instrumented_libraries=1 instrumented_libraries_jobs=8" \
+  GYP_DEFINES="${gyp_defines} \
+               use_instrumented_libraries=1 instrumented_libraries_jobs=8" \
   GYP_GENERATOR_FLAGS="output_dir=${out_dir}" \
   gclient runhooks
 
-  ninja -C ${out_dir}/Release instrumented_libraries
+  ninja -j4 -C ${out_dir}/Release instrumented_libraries
 
   echo "Creating archive ${archive_name}.tgz..."
 
   files=$(ls -1 ${out_dir}/Release/instrumented_libraries)
 
-  tar zcf ${archive_name}.tgz -C ${out_dir}/Release/instrumented_libraries --exclude="?san/*.txt" ${files}
+  tar zcf ${archive_name}.tgz -C ${out_dir}/Release/instrumented_libraries \
+      --exclude="?san/*.txt" ${files}
 
   echo To upload, run:
-  echo upload_to_google_storage.py -b chromium-instrumented-libraries ${archive_name}.tgz
+  echo upload_to_google_storage.py -b \
+       chromium-instrumented-libraries ${archive_name}.tgz
   echo You should then commit the resulting .sha1 file.
 }
 
 if ! [[ "${supported_releases}" =~ ${ubuntu_release} ]]
 then
   echo "Unsupported Ubuntu release: ${ubuntu_release}"
+  echo "Supported releases: ${supported_releases}"
   exit 1
 fi
 
 if [ -z "${1-}" ]
 then
   show_help
   exit 0
 fi
 
 if ! [[ "all ${supported_build_types}" =~ $1 ]]
 then
   show_help
   exit 1
 fi
 if [ "$1" == "all" ]
 then
   for build_type in ${supported_build_types}
   do
     build_libraries ${build_type}
   done
 else
   build_libraries $1
 fi