make vanilla android_ninja work, and add quiet options

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Parse the arguments for a DEVICE_ID.
 DEVICE_ID=""
 DEVICE_SERIAL=""
 while (( "$#" )); do
   if [[ $(echo "$1" | grep "^-d$") != "" ]];
   then
     DEVICE_ID=$2
     shift
   elif [[ "$1" == "-s" ]];
   then
     if [[ $# -lt 2 ]];
     then
       echo "ERROR: missing serial number"
       exit 1;
     fi
     DEVICE_SERIAL="-s $2"
     shift
   else
     APP_ARGS=("${APP_ARGS[@]}" "${1}")
   fi
 
   shift
 done
 
+function verbose {
+    if [[ -n $VERBOSE ]]; then

[borenet, 2013/09/30 20:42:10]

Could we rename this variable so that it's clear what it's affecting
(SKIA_VERBOSE_ANDROID_BUILD or something)?

+        echo $@
+    fi
+}
+
 function exportVar {
   NAME=$1
   VALUE=$2
-  echo export $NAME=\"$VALUE\"
+  verbose export $NAME=\"$VALUE\"
   export $NAME="$VALUE"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # A valid Android SDK installation is required to build the sample app.
 if [ -z "$ANDROID_SDK_ROOT" ]; then
   ANDROID_TOOL=$(which android 2>/dev/null)
   if [ -z "$ANDROID_TOOL" ]; then
     echo "ERROR: Please define ANDROID_SDK_ROOT in your environment to point"
@@ skipping 31 matching lines @@
     NDK_REV="8e"
   fi
 
   if [[ -z "$ANDROID_ARCH" ]];
   then
     ANDROID_ARCH="arm"
   fi
 
   TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains
   if [ $(uname) == "Linux" ]; then
-    echo "Using Linux toolchain."
+    verbose "Using Linux toolchain."
     TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-linux_v$API_LEVEL
   elif [ $(uname) == "Darwin" ]; then
-    echo "Using Mac toolchain."
+    verbose "Using Mac toolchain."
     TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-mac_v$API_LEVEL
   else
-    echo "Could not automatically determine toolchain!  Defaulting to Linux."
+    verbose "Could not automatically determine toolchain!  Defaulting to Linux."
     TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-linux_v$API_LEVEL
   fi
   exportVar ANDROID_TOOLCHAIN ${TOOLCHAIN_DIR}/${TOOLCHAIN_TYPE}/bin
 
   # if the toolchain doesn't exist on your machine then we need to fetch it
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     # create the toolchain directory if needed
     if [ ! -d "$TOOLCHAIN_DIR" ]; then
       mkdir $TOOLCHAIN_DIR
     fi
@@ skipping 13 matching lines @@
     echo "Removing $TARBALL"
     rm $TARBALL
     popd
   fi
 
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     echo "ERROR: unable to download/setup the required toolchain (${TOOLCHAIN_TYPE})"
     return 1;
   fi
 
-  echo "The build is targeting NDK API level $API_LEVEL for use on Android 4.0 (NDK Revision $NDK_REV) and above"
+  verbose "The build is targeting NDK API level $API_LEVEL for use on Android 4.0 (NDK Revision $NDK_REV) and above"
 
   LS="/bin/ls"  # Use directly to avoid any 'ls' alias that might be defined.
   GCC=$($LS $ANDROID_TOOLCHAIN/*-gcc | head -n1)
   if [ -z "$GCC" ]; then
     echo "ERROR: Could not find Android cross-compiler in: $ANDROID_TOOLCHAIN"
     return 1
   fi
 
   # Remove the '-gcc' at the end to get the full toolchain prefix
   ANDROID_TOOLCHAIN_PREFIX=${GCC%%-gcc}
@@ skipping 21 matching lines @@
   DEFINES="${DEFINES} skia_os=android"
   DEFINES="${DEFINES} android_base=${SCRIPT_DIR}/.."
   DEFINES="${DEFINES} skia_shared_lib=1"
 
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
   if [ -z "$TARGET_DEVICE" ]; then
     if [ -f .android_config ]; then
       TARGET_DEVICE=$(cat .android_config)
-      echo "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
+      verbose "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
     else
       TARGET_DEVICE="arm_v7_thumb"
-      echo "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
+      verbose "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
     fi
   fi
 
   case $TARGET_DEVICE in
     nexus_s)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
       ANDROID_ARCH="arm"
       ;;
     nexus_4 | nexus_7 | nexus_10)
@@ skipping 40 matching lines @@
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
       ANDROID_ARCH="x86"
       ;;
     *)
       echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
       echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm_v7_thumb x86"
       return 1;
       ;;
   esac
 
-  echo "The build is targeting the device: $TARGET_DEVICE"
+  verbose "The build is targeting the device: $TARGET_DEVICE"
   export DEVICE_ID="$TARGET_DEVICE"
 
   # Set up the toolchain.
   setup_toolchain
   if [[ "$?" != "0" ]]; then
     return 1
   fi
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
 
   exportVar GYP_DEFINES "$DEFINES"
@@ skipping 76 matching lines @@
   else
     $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
   fi
 }
 
 # Set up the device.
 setup_device "${DEVICE_ID}"
 if [[ "$?" != "0" ]]; then
   exit 1
 fi