Fix android_install_apk script to work with changes from a137675

platform_tools/android/bin/android_install_apk

 #!/bin/bash
 #
 # android_install_skia: installs the skia apk on the device.
 
 function print_usage {
   echo "USAGE: android_install_skia [options]"
   echo " Options:         -f  Forces the package to be installed by removing any"
   echo "                      previously installed packages"
   echo "                  -h  Prints this help message"
   echo "            --release Install the release build of Skia"
   echo "      -s [device_s/n] Serial number of the device to be used"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
 
 forceRemoval="false"
 installLauncher="false"
 installOptions="-r"
-configuration="Debug"
 
 for arg in ${APP_ARGS[@]}
 do
   if [[ "${arg}" == "-f" ]];
   then
     forceRemoval="true"
   elif [[ "${arg}" == "-h" ]];
   then
     print_usage
     exit
   elif [[ "${arg}" == "-r" ]];

[mtklein, 2014/05/06 17:58:06]

Anyone using -r?  Clean this up while we're at it?

   then
     echo "DEPRECATED: -r is now a no-op"
-  elif [[ "${arg}" == "--release" ]];
-  then
-    configuration="Release"
   else
     echo "ERROR: unrecognized option ${arg}"
     print_usage
     exit 1;
   fi
 done
 
 if [[ "$forceRemoval" == "true" ]];
 then
     echo "Forcing removal of previously installed packages"
     $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null
 fi
 
-echo "Installing Skia App from ${SKIA_OUT}/${configuration}"
-$ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${configuration}/android/bin/SkiaAndroid.apk
+echo "Installing Skia App from ${SKIA_OUT}/${BUILDTYPE}"
+$ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android/bin/SkiaAndroid.apk