Modify android_install_app to install VisualBench

BUG=skia:

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

2 files changed, 26 insertions, 14 deletions

diff --git a/platform_tools/android/bin/android_install_app b/platform_tools/android/bin/android_install_app
index b43b77d69e..a8c1a12b2b 100755
--- a/platform_tools/android/bin/android_install_app
+++ b/platform_tools/android/bin/android_install_app
@@ -9,6 +9,7 @@ function print_usage {
   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 SampleApp or VisualBench"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -19,31 +20,42 @@ source $SCRIPT_DIR/utils/setup_adb.sh
 forceRemoval="false"
 installLauncher="false"
 installOptions="-r"
+app=""
 
-for arg in ${APP_ARGS[@]}
-do
-  if [[ "${arg}" == "-f" ]];
-  then
+for arg in ${APP_ARGS[@]}; do
+  if [[ "${arg}" == "-f" ]]; then
     forceRemoval="true"
-  elif [[ "${arg}" == "-h" ]];
-  then
+  elif [[ "${arg}" == "-h" ]]; then
     print_usage
     exit
-  elif [[ "${arg}" == "-r" ]];
-  then
+  elif [[ "${arg}" == "-r" ]]; then
     echo "DEPRECATED: -r is now a no-op"
-  else
+  elif [[ ${arg} == '-'* ]]; then
     echo "ERROR: unrecognized option ${arg}"
     print_usage
     exit 1;
+  else
+    if [[ ${app} != "" ]]; then
+      echo "ERROR: app already defined ${app}"
+      exit 1;
+    else
+      app=${arg}
+    fi
   fi
 done
 
+if [[ ${app} == "" ]]; then
+  echo "defaulting to installing SampleApp."
+  app="SampleApp"
+fi
+
+
 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}/${BUILDTYPE}"
-$ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android/bin/SkiaAndroid.apk
+echo "Installing ${app} from ${SKIA_OUT}/${BUILDTYPE}"
+$ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android/${app}/bin/${app}.apk
+
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index a250b5958c..e8bf1c3150 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -78,7 +78,7 @@
        },
       'actions': [
         {
-          'action_name': 'SkiaAndroid_apk',
+          'action_name': 'SampleApp_apk',
           'inputs': [
             '<(android_base)/app/AndroidManifest.xml',
             '<(android_base)/app/build.xml',
@@ -90,7 +90,7 @@
             '<(android_base)/app/src/com/skia/SkiaSampleView.java',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/../android/SampleApp/bin/SkiaAndroid.apk',
+            '<(PRODUCT_DIR)/../android/SampleApp/bin/SampleApp.apk',
           ],
           'action': [
             'ant',
@@ -100,7 +100,7 @@
             '-Dout.dir=<(ANDROID_OUT)/bin',
             '-Dgen.absolute.dir=<(ANDROID_OUT)/gen',
             '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
-            '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
+            '-Dout.final.file=<(ANDROID_OUT)/bin/SampleApp.apk',
             '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
             'debug',
           ],