diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 15:45:55 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 15:45:55 +0000 |
| commit | 42f69c28c67a9feec5084138b76992af94477432 (patch) | |
| tree | 89a42d70170dad5a53035b92d78cb9e5db756b33 /android | |
| parent | 0b92c0fa26073b375fdab97b5ea1691178362605 (diff) | |
Android: replace installApk.sh "launching Rockbox activity"-behaviour with
'make launch'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29565 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
| -rw-r--r-- | android/android.make | 4 | ||||
| -rwxr-xr-x | android/installApk.sh | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/android/android.make b/android/android.make index 7b7f222b7f..3f425cab2d 100644 --- a/android/android.make +++ b/android/android.make @@ -129,5 +129,7 @@ dirs: $(DIRS) apk: $(APK) install: apk - $(ADB) install -r $(APK) + $(SILENT)$(ADB) install -r $(APK) +launch: + $(SILENT)echo 'am start -a android.intent.action.MAIN -n org.rockbox/.RockboxActivity; exit' | $(ADB) shell >/dev/null diff --git a/android/installApk.sh b/android/installApk.sh deleted file mode 100755 index 5fd6afa810..0000000000 --- a/android/installApk.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -ADB="$ANDROID_SDK_PATH/tools/adb" -if [ ! -e $ADB ] -then - # Starting with the gingerbread sdk, the adb location changed - ADB="$ANDROID_SDK_PATH/platform-tools/adb" -fi - -$ADB install -r rockbox.apk -echo 'am start -a android.intent.action.MAIN -n org.rockbox/.RockboxActivity; exit' | $ADB shell |