From a448d8bac7c97c008afcc0c435c7e9777c069b26 Mon Sep 17 00:00:00 2001
From: Antoine Cellerier <dionoea@videolan.org>
Date: Mon, 24 Jan 2011 17:06:04 +0000
Subject: Android build tweaks.

Add make install target for android builds.
Remove standard install targets as they don't apply.
Add java compilation dependancy on generated resource class(es?) to prevent weird runtime issues.
Update installApk.sh script to use correct tool location in recent sdks.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29131 a1c6a512-1295-4272-9138-f99709370657
---
 android/installApk.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'android/installApk.sh')

diff --git a/android/installApk.sh b/android/installApk.sh
index 2c82b115c6..5fd6afa810 100755
--- a/android/installApk.sh
+++ b/android/installApk.sh
@@ -1,5 +1,10 @@
 #!/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
-- 
cgit v1.2.3