From da8b263a97923d25a9e6d518fc6e6d1df2a136fc Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Fri, 11 Oct 2013 23:53:46 -0300 Subject: [PATCH] Android hints: Only use adb if $targetrun is set to adb This loses us some DWIMnery, but allows cross-compiling to android using ssh, which is much easier to set up than getting the SDK. --- hints/linux-android.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hints/linux-android.sh b/hints/linux-android.sh index 3d2c3ce..5b39481 100644 --- a/hints/linux-android.sh +++ b/hints/linux-android.sh @@ -124,6 +124,8 @@ fi EOCBU +if $test "X$targetrun" = "Xadb"; then + case "$src" in /*) run=$src/Cross/run targetmkdir=$src/Cross/mkdir @@ -137,7 +139,7 @@ case "$src" in from=$pwd/Cross/from ;; esac - + targetrun=adb-shell targetto=adb-push targetfrom=adb-pull @@ -237,6 +239,8 @@ exit 0 EOF $chmod a+rx $from +fi # Cross-compiling with adb + if $test "X$hostosname" = "Xdarwin"; then firstmakefile=GNUmakefile; fi -- 2.7.4