build an apk containing git-annex and a terminal emulator

Makefile

@@ -241,22 +241,7 @@ ANDROIDAPP_DEST=$(GIT_ANNEX_TMP_BUILD_DIR)/git-annex.android
 androidapp:
 	$(MAKE) android
 	$(MAKE) -C standalone/android
-
+	cp standalone/android/source/term/bin/Term-debug.apk $(GIT_ANNEX_TMP_BUILD_DIR)/GitAnnex.apk
-	rm -rf "$(ANDROIDAPP_DEST)"
-	install -d "$(ANDROIDAPP_DEST)"
-
-	cp -aR standalone/android/git-annex-bundle "$(ANDROIDAPP_DEST)"
-	cp -a standalone/android/runshell "$(ANDROIDAPP_DEST)"
-	install -d "$(ANDROIDAPP_DEST)/git-annex-bundle/bin"
-	cp git-annex "$(ANDROIDAPP_DEST)/git-annex-bundle/bin/"
-
-	$$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin/arm-linux-androideabi-strip "$(ANDROIDAPP_DEST)"/git-annex-bundle/bin/*
-
-	ln -sf git-annex "$(ANDROIDAPP_DEST)/git-annex-bundle/bin/git-annex-shell"
-	zcat standalone/licences.gz > $(ANDROIDAPP_DEST)/git-annex-bundle/LICENSE
-	install -d "$(ANDROIDAPP_DEST)/git-annex-bundle/templates"
-	
-	cd $(ANDROIDAPP_DEST) && tar czf ../git-annex-android.tar.gz .
 
 # used by ./ghci
 getflags:

standalone/android/.gitignore

@@ -0,0 +1 @@
+build-utils

standalone/android/Makefile

@@ -1,13 +1,67 @@
-# Cross-compiles utilities needed for git-annex on Android.
+# Cross-compiles utilities needed for git-annex on Android,
+# and builds the Android app.
 
 # Add Android cross-compiler to PATH (as installed by ghc-android)
 # (This directory also needs to have a cc that is a symlink to the prefixed
 # gcc cross-compiler executable.)
 PATH:=$(HOME)/.ghc/android-14/arm-linux-androideabi-4.7/bin:$(PATH)
 
-build: source
+# Paths to the Android SDK and NDK.
-	mkdir -p git-annex-bundle/bin
+export ANDROID_SDK_ROOT=$(HOME)/tmp/adt-bundle-linux-x86/sdk
+export ANDROID_NDK_ROOT=$(HOME)/tmp/android-ndk-r8d
 
+GITTREE=source/git/installed-tree
+
+build: source build-utils
+	# Debug build because it does not need signing keys.
+	cd source/term && tools/build-debug
+
+	# Install executables as pseudo-libraries so they will be
+	# unpacked from the .apk.
+	mkdir -p source/term/libs/armeabi
+	cp ../../git-annex source/term/libs/armeabi/lib.git-annex.so
+	cp source/busybox/busybox source/term/libs/armeabi/lib.busybox.so
+	cp source/openssh/ssh source/term/libs/armeabi/lib.ssh.so
+	cp source/openssh/ssh-keygen source/term/libs/armeabi/lib.ssh-keygen.so
+	cp source/rsync/rsync source/term/libs/armeabi/lib.rsync.so
+	cp source/gnupg/g10/gpg source/term/libs/armeabi/lib.gpg.so
+	cp source/git/git source/term/libs/armeabi/lib.git.so
+	cp source/git/git-shell source/term/libs/armeabi/lib.git-shell.so
+	cp source/git/git-upload-pack source/term/libs/armeabi/lib.git-upload-pack.so
+	arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note source/term/libs/armeabi/*
+	cp runshell source/term/libs/armeabi/lib.runshell.so
+	
+	# remove git stuff we don't need to save space
+	rm -rf $(GITTREE)/bin/git-cvsserver \
+		$(GITTREE)/libexec/git-core/git-daemon \
+		$(GITTREE)/libexec/git-core/git-show-index \
+		$(GITTREE)/libexec/git-core/mergetools \
+		$(GITTREE)/libexec/git-core/git-credential-* \
+		$(GITTREE)/libexec/git-core/git-cvsserver \
+		$(GITTREE)/libexec/git-core/git-cvsimport \
+		$(GITTREE)/libexec/git-core/git-fast-import \
+		$(GITTREE)/libexec/git-core/git-http-backend \
+		$(GITTREE)/libexec/git-core/git-imap-send \
+		$(GITTREE)/libexec/git-core/git-instaweb \
+		$(GITTREE)/libexec/git-core/git-p4 \
+		$(GITTREE)/libexec/git-core/git-remote-test* \
+		$(GITTREE)/libexec/git-core/git-submodule \
+		$(GITTREE)/libexec/git-core/git-svn \
+		$(GITTREE)/libexec/git-core/git-web--browse
+	# Most of git is in one multicall binary, but a few important
+	# commands are still shell scripts. Those are put into
+	# a tarball, along with a list of all the hard links that should be
+	# set up.
+	cd $(GITTREE) && mkdir -p links
+	cd $(GITTREE) && find -samefile bin/git > links/git
+	cd $(GITTREE) && find -samefile bin/git-shell > links/git-shell
+	cd $(GITTREE) && find -samefile bin/git-upload-pack > links/git-upload-pack
+	cd $(GITTREE) && find -type f -not -samefile bin/git -not -samefile bin/git-shell -not -samefile bin/git-upload-pack|tar czf ../git.tar.gz -T -
+	cp source/git/git.tar.gz source/term/libs/armeabi/lib.git.tar.gz.so
+
+	cd source/term && ant debug
+
+build-utils: source
 	cd source/openssl && CC=$$(which cc) ./Configure android
 	cd source/openssl && $(MAKE)
 
@@ -18,27 +72,35 @@ build: source
 	cd source/openssh && sed -i -e 's/getrrsetbyname.o //' openbsd-compat/Makefile
 	cd source/openssh && sed -i -e 's/auth-passwd.o //' Makefile
 	cd source/openssh && $(MAKE) ssh ssh-keygen
-	cp -a source/openssh/ssh source/openssh/ssh-keygen git-annex-bundle/bin/
 
 	cp busybox_config source/busybox/.config
 	cd source/busybox && yes '' | $(MAKE) oldconfig
 	cd source/busybox && $(MAKE)
-	cp -a source/busybox/busybox git-annex-bundle/bin/
 	
-	cd source/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=../../git-annex-bundle
+	cd source/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=installed-tree
-	rm -f git-annex-bundle/bin/git-cvsserver
 
 	cd source/rsync && git reset --hard origin/master && git am < ../../rsync.patch
 	cp source/automake/lib/config.sub source/automake/lib/config.guess source/rsync/
 	cd source/rsync && ./configure --host=arm-linux-androideabi --disable-locale --disable-iconv-open --disable-iconv --disable-acl-support --disable-xattr-support
 	cd source/rsync && $(MAKE)
-	cp -a source/rsync/rsync git-annex-bundle/bin/
 
 	cd source/gnupg && git checkout gnupg-1.4.13
 	cd source/gnupg && ./autogen.sh
 	cd source/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls
 	cd source/gnupg; $(MAKE) || true # expected failure in doc build
-	cp -a source/gnupg/g10/gpg git-annex-bundle/bin/
+
+	cd source/term && git reset --hard
+	cd source/term && patch -p1 <../../term.patch
+	# This renaming has a purpose. It makes the path to the app's
+	# /data directory shorter, which makes ssh connection caching
+	# sockets placed there have more space for their filenames.
+	# Also, it avoids overlap with the Android Terminal Emulator
+	# app, if it's also installed.
+	cd source/term && find -name .git -prune -o -type f -print0 | xargs -0 perl -pi -e 's/jackpal/ga/g'
+	cd source/term && perl -pi -e 's/Terminal Emulator/Git Annex/g' res/*/strings.xml
+	cd source/term && tools/update.sh
+
+	touch build-utils
 
 source:
 	mkdir -p source
@@ -49,14 +111,17 @@ source:
 	git clone git://git.gnupg.org/gnupg.git source/gnupg
 	git clone git://git.openssl.org/openssl source/openssl
 	git clone git://github.com/CyanogenMod/android_external_openssh.git source/openssh
+	git clone git://github.com/jackpal/Android-Terminal-Emulator.git source/term
 
 clean:
+	rm -rf $(GITTREE) build-utils
 	cd source/busybox && $(MAKE) clean
-	cd source/openssl && $(MAKE) clean
+	#cd source/openssl && $(MAKE) clean
 	cd source/openssh && $(MAKE) clean
 	cd source/git && $(MAKE) clean
 	cd source/rsync && $(MAKE) clean
 	cd source/gnupg && $(MAKE) clean
+	cd source/term && ant clean
 
 reallyclean:
 	rm -rf source

standalone/android/runshell

@@ -1,43 +1,53 @@
 #!/system/bin/sh
-# Runs a shell command (or interactive shell) using the binaries and
+# This is run by the Android app, and runs a shell in an environment
-# libraries bundled with this app.
+# configured for git-annex.
 
 set -e
 
-here="$(dirname $0)"
+# I'm installed as lib/lib.runshell.so
-base="$here/git-annex-bundle"
-
-if [ ! -d "$base" ]; then
-	echo "** cannot find base directory (I seem to be $0)" >&2
-	exit 1
-fi
-
-if [ ! -e "$base/bin/git-annex" ]; then
-	echo "** base directory $base does not contain bin/git-annex" >&2
-	exit 1
-fi
-if [ ! -e "$base/bin/git" ]; then
-	echo "** base directory $base does not contain bin/git" >&2
-	exit 1
-fi
-
-# Install busybox links.
-if [ ! -e "$base/bin/sha256sum" ]; then
-	echo "(First run detected ... setting up busybox ...)"
-	"$base/bin/busybox" --install "$base/bin"
-fi
-
-# Get absolute path to base, to avoid breakage when things change directories.
 orig="$(pwd)"
-cd "$base"
+cd "$0/../.."
 base="$(pwd)"
 cd "$orig"
 
-# Put our binaries first, to avoid issues with out of date or incompatable
+# Cannot rely on Android providing a sane HOME
-# system or App binaries.
+HOME="/sdcard/git-annex.home"
-ORIG_PATH="$PATH"
+export HOME
-export ORIG_PATH
+
-PATH=$base/bin:$PATH
+setup () {
+	echo "Installation starting to $base"
+	mkdir -p "$base/bin"
+	for prog in busybox git-annex git-shell git-upload-pack git gpg rsync ssh-keygen; do
+		echo "installing $prog"
+		ln $base/lib/lib.$prog.so $base/bin/$prog
+	done
+	$base/bin/busybox --install $base/bin
+	$base/bin/tar zxf lib/lib.git.tar.gz.so
+
+	for prog in git git-shell git-upload-pack; do
+		for link in $(cat $base/links/$prog); do
+			echo "linking $link to $prog"
+			ln $base/bin/$prog $base/$link
+		done
+		rm $base/links/$prog
+	done
+
+	mkdir -p "$base/templates"
+	mkdir -p "$base/tmp"
+	echo "Installation complete"
+}
+
+if [ ! -d "$base/bin" ]; then
+	if ! mkdir -p "$HOME"; then
+		echo "mkdir of $HOME failed!"
+	fi
+	if ! setup > $HOME/git-annex-install.log 2>&1; then
+		echo "Installation failed! Please report a bug and attach $HOME/git-annex-install.log"
+		sh
+	fi
+fi
+
+PATH="$base/bin:$PATH"
 export PATH
 
 ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH"
@@ -51,14 +61,13 @@ GIT_TEMPLATE_DIR="$base/templates"
 export GIT_TEMPLATE_DIR
 
 # Indicate which variables were exported above.
-GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR"
+GIT_ANNEX_STANDLONE_ENV="GIT_EXEC_PATH GIT_TEMPLATE_DIR"
 export GIT_ANNEX_STANDLONE_ENV
 
 # This is a temporary directory on a non-crippled filesystem.
 # This needs to be as short a path as possible.
-GIT_ANNEX_TMP_DIR=$here/tmp
+GIT_ANNEX_TMP_DIR=$base/tmp
 export GIT_ANNEX_TMP_DIR
-mkdir -p "$GIT_ANNEX_TMP_DIR"
 
 if [ "$1" ]; then
 	cmd="$1"

standalone/android/term.patch

@@ -0,0 +1,56 @@
+diff --git a/tools/build-debug b/tools/build-debug
+index 1f15cd2..e611956 100755
+--- a/tools/build-debug
++++ b/tools/build-debug
+@@ -34,4 +34,4 @@ fi
+ 
+ rm -rf `find . -name bin -o -name obj -prune`
+ cd jni
+-$ANDROID_NDK_ROOT/ndk-build && cd .. && ant debug
++$ANDROID_NDK_ROOT/ndk-build && cd ..
+diff --git a/tools/update.sh b/tools/update.sh
+index 57219c3..79b45ef 100755
+--- a/tools/update.sh
++++ b/tools/update.sh
+@@ -18,7 +18,7 @@ command -v "$ANDROID" >/dev/null 2>&1 || { echo >&2 "The $ANDROID tool is not fo
+ 
+ # Make sure target-11 is installed
+ 
+-$ANDROID update sdk -u -t android-11
++$ANDROID update sdk -u -t android-17
+ 
+ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ ATE_ROOT="$( cd $DIR/.. && pwd )"
+@@ -31,5 +31,5 @@ for PROJECT_FILE in $PROJECT_FILES
+ do
+     PROJECT_DIR="$( dirname "$PROJECT_FILE" )"
+     echo "Updating $PROJECT_FILE"
+-    $ANDROID update project -p "$PROJECT_DIR" --target android-11
++    $ANDROID update project -p "$PROJECT_DIR" --target android-17
+ done
+diff --git a/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java b/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java
+index f6952f0..4b2aa5f 100644
+--- a/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java
++++ b/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java
+@@ -166,7 +166,7 @@ public class TermActivity extends Activity
+         /* ... create a process ... */
+         String execPath = LaunchActivity.getDataDir(this) + "/bin/execpty";
+         ProcessBuilder execBuild =
+-                new ProcessBuilder(execPath, "/system/bin/sh", "-");
++                new ProcessBuilder(execPath, "/data/data/ga.androidterm/lib/lib.runshell.so", "");
+         execBuild.redirectErrorStream(true);
+         Process exec = null;
+         try {
+diff --git a/res/values/defaults.xml b/res/values/defaults.xml
+index 67287b2..cc2f691 100644
+--- a/res/values/defaults.xml
++++ b/res/values/defaults.xml
+@@ -13,7 +13,7 @@
+    <string name="pref_fnkey_default">4</string>
+    <string name="pref_ime_default">0</string>
+    <bool name="pref_alt_sends_esc_default">false</bool>
+-   <string name="pref_shell_default">/system/bin/sh -</string>
++   <string name="pref_shell_default">/data/data/ga.androidterm/lib/lib.runshell.so</string>
+    <string name="pref_initialcommand_default"></string>
+    <string name="pref_termtype_default">screen</string>
+    <bool name="pref_close_window_on_process_exit_default">true</bool>