diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-04 14:25:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-04 14:25:24 -0400 |
| commit | 18a447fe97721eb0906a5c9e9613d39702d6c825 (patch) | |
| tree | bd6b6777e3a8567a34250bedf856a562afc2725d | |
| parent | 14750badab245c4e2a52276b00663f3cac47f10e (diff) | |
android build fix
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | standalone/android/Makefile | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -181,11 +181,9 @@ android: Build/EvilSplicer # Cabal cannot cross compile with custom build type, so workaround. sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal if [ ! -e tmp/androidtree/dist/setup/setup ]; then \ - cd tmp/androidtree; \ - cabal configure; \ - $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f"Android $(ANDROID_FLAGS)"; \ + cd tmp/androidtree && $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f"Android $(ANDROID_FLAGS)"; \ fi - $(MAKE) -C tmp/androidtree git-annex + cd tmp/androidtree && $(CABAL) build adb: ANDROID_FLAGS="-Production" $(MAKE) android diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 0ecbdc078..74a48c89f 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -32,7 +32,7 @@ build: start # Install executables as pseudo-libraries so they will be # unpacked from the .apk. mkdir -p $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi - cp ../../tmp/androidtree/git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so + cp ../../tmp/androidtree/dist/build/git-annex/git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so cp $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/busybox $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.busybox.so cp $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/ssh $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.ssh.so cp $(GIT_ANNEX_ANDROID_SOURCETREE)/openssh/ssh-keygen $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.ssh-keygen.so |