SampleApp: Make android_install_app and android_launch_app work consistently

Make android_install_app work more consistently:
* App can be "SampleApp" or "VisualBench"

Make android_launch_app work more consistently:
* Parameters to SampleApp are passed correctly
* SampleApp is actually launched

The parameters to "am" need to be quoted, since the command
is run on the device shell.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1589883002

Review URL: https://codereview.chromium.org/1589883002

2 files changed, 13 insertions, 8 deletions

diff --git a/platform_tools/android/bin/android_install_app b/platform_tools/android/bin/android_install_app
index 01a792e9f9..4b29b09864 100755
--- a/platform_tools/android/bin/android_install_app
+++ b/platform_tools/android/bin/android_install_app
@@ -1,15 +1,15 @@
 #!/bin/bash
 #
-# android_install_app: installs the skia sampleApp on the device.
+# android_install_app: installs the Skia development apps on the device.
 
 function print_usage {
-  echo "USAGE: android_install_app [options]"
+  echo "USAGE: android_install_app [options] AppName"
   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"
-  echo "              AppName Can be either sample_app or VisualBench"
+  echo "              AppName Can be either SampleApp or VisualBench"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -43,8 +43,8 @@ for arg in ${APP_ARGS[@]}; do
 done
 
 if [[ ${app} == "" ]]; then
-  echo "defaulting to installing sample_app."
-  app="sample_app"
+  echo "Defaulting to installing SampleApp."
+  app="SampleApp"
 fi
 
 
@@ -61,6 +61,9 @@ else
     apk_suffix="debug.apk"
 fi
 
+if [[ ${app} == 'SampleApp' ]]; then
+    app="sample_app"
+fi
 
 APP_LC=$(echo $app | tr "[:upper:]" "[:lower:]")
 
diff --git a/platform_tools/android/bin/android_launch_app b/platform_tools/android/bin/android_launch_app
index 1d4bc4695a..e5fd54c96a 100755
--- a/platform_tools/android/bin/android_launch_app
+++ b/platform_tools/android/bin/android_launch_app
@@ -14,15 +14,17 @@ fi
 
 app=${APP_ARGS[0]}
 if [[ ${app} == '-'* ]]; then
+    echo "Defaulting to running SampleApp."
     app="SampleApp"
     APP_ARGS=( "SampleApp" ${APP_ARGS[*]} )
 fi
 
 if [[ ${app} == 'SampleApp' ]]; then
-    $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia.sampleapp/com.skia.SkiaSampleActivity" --es "cmdLineFlags" "${APP_ARGS[*]:1}"
+    activity="com.skia.sample_app/com.skia.SkiaSampleActivity"
 elif [[ ${app} == "VisualBench" ]] ; then
-    $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia.visualbench/com.skia.VisualBenchActivity" --es "cmdLineFlags" \"${APP_ARGS[*]:1}\"
+    activity="com.skia.visualbench/com.skia.VisualBenchActivity"
 else
     echo "ERROR: supports either 'SampleApp' or 'VisualBench' as valid apps"
+    exit 1
 fi
-
+$ADB ${DEVICE_SERIAL} shell "am start -S -n ${activity} --es cmdLineFlags \"${APP_ARGS[*]:1}\""