Fix ninja build for Android

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
+  elif [[ $(echo "$1" | grep "^BUILDTYPE=") != "" ]];

[mtklein, 2014/04/03 14:26:37]

I'd prefer just
    elif echo $1 | grep -q ^BUILDTYPE=; then
but I guess the rest of the file sets the odd precedent.

+  then
+    BUILDTYPE=${1##BUILDTYPE=}
   else
     APP_ARGS=("${APP_ARGS[@]}" "${1}")
   fi
 
   shift
 done
 
 function verbose {
     if [[ -n $SKIA_ANDROID_VERBOSE_SETUP ]]; then
         echo $@
@@ skipping 305 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