diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 18:29:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 18:29:28 +0000 |
| commit | c1dc0d486ff1f537378205a2d1698ce2044e7735 (patch) | |
| tree | 504f282ec55006bc3036738bd2a1747c86b09123 /platform_tools/android | |
| parent | 80116dcf1e1baf9817ae42d0aca51f7eabaa2880 (diff) | |
Fix android_install_apk script to work with changes from a137675
(http://crrev.com/223613004). See http://crrev.com/256413006 or
http://crrev.com/262053007 for similar changes.
R=djsollen@google.com, mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/266373005
git-svn-id: http://skia.googlecode.com/svn/trunk@14593 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/android_install_apk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/platform_tools/android/bin/android_install_apk b/platform_tools/android/bin/android_install_apk index 0b1561335e..9161bbb41c 100755 --- a/platform_tools/android/bin/android_install_apk +++ b/platform_tools/android/bin/android_install_apk @@ -19,7 +19,6 @@ source $SCRIPT_DIR/utils/setup_adb.sh forceRemoval="false" installLauncher="false" installOptions="-r" -configuration="Debug" for arg in ${APP_ARGS[@]} do @@ -33,9 +32,6 @@ do elif [[ "${arg}" == "-r" ]]; then echo "DEPRECATED: -r is now a no-op" - elif [[ "${arg}" == "--release" ]]; - then - configuration="Release" else echo "ERROR: unrecognized option ${arg}" print_usage @@ -49,5 +45,5 @@ then $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 |