From 73b252c451df2070ff4af866cd1f53ab85fb133e Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Sun, 30 Jan 2011 20:21:20 +0100
Subject: [PATCH 06/10] Android: replace installApk.sh "launching Rockbox activity"-behaviour with
 'make launch'

---
 android/android.make  |    4 +++-
 android/installApk.sh |   10 ----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100755 android/installApk.sh

diff --git a/android/android.make b/android/android.make
index da62d90..92f9d4f 100644
--- a/android/android.make
+++ b/android/android.make
@@ -116,5 +116,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 5fd6afa..0000000
--- 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
-- 
1.7.1