diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-06 15:01:37 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-06 15:01:37 +0000 |
| commit | 7507276d8626a6d4a4073b3f93bd2eaa9f21f111 (patch) | |
| tree | 3ae2c879ffd41c4b2005dce6099f06b0f8102c45 /platform_tools/android/bin | |
| parent | 7a2269ea7352f0580422f193081b6d7028651138 (diff) | |
Fix installing the release build sample app apk
The android_setup.sh parses command line arguments and stores the ones
it does not use to APP_ARGS variable.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/61553002
git-svn-id: http://skia.googlecode.com/svn/trunk@12153 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/bin')
| -rwxr-xr-x | platform_tools/android/bin/android_install_apk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/platform_tools/android/bin/android_install_apk b/platform_tools/android/bin/android_install_apk index 039acbb6d1..0b1561335e 100755 --- a/platform_tools/android/bin/android_install_apk +++ b/platform_tools/android/bin/android_install_apk @@ -21,28 +21,26 @@ installLauncher="false" installOptions="-r" configuration="Debug" -while (( "$#" )); do - - if [[ "$1" == "-f" ]]; +for arg in ${APP_ARGS[@]} +do + if [[ "${arg}" == "-f" ]]; then forceRemoval="true" - elif [[ "$1" == "-h" ]]; + elif [[ "${arg}" == "-h" ]]; then print_usage exit - elif [[ "$1" == "-r" ]]; + elif [[ "${arg}" == "-r" ]]; then echo "DEPRECATED: -r is now a no-op" - elif [[ "$1" == "--release" ]]; - then + elif [[ "${arg}" == "--release" ]]; + then configuration="Release" else - echo "ERROR: unrecognized option $1" + echo "ERROR: unrecognized option ${arg}" print_usage exit 1; fi - -shift done if [[ "$forceRemoval" == "true" ]]; |