summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-14 13:25:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-14 13:43:36 -0400
commit7a1165bc3ac8c9069ed6fd5043227d284dc6b83b (patch)
tree3977f9271e88f720f292f9f5bab352ebbe7efcb0 /standalone
parent7f84f433afb11245f875e279a20ae0748b92ba1a (diff)
incremental android builds with the EvilSplicer
Diffstat (limited to 'standalone')
-rw-r--r--standalone/android/Makefile2
-rw-r--r--standalone/android/evilsplicer-headers.hs17
2 files changed, 18 insertions, 1 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 7b70054cf..44a2fc71f 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 ../../git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
+ cp ../../tmp/androidtree/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
diff --git a/standalone/android/evilsplicer-headers.hs b/standalone/android/evilsplicer-headers.hs
new file mode 100644
index 000000000..bdcb6383c
--- /dev/null
+++ b/standalone/android/evilsplicer-headers.hs
@@ -0,0 +1,17 @@
+
+
+{- This file was modified by the EvilSplicer, adding these headers,
+ - and expanding Template Haskell.
+ -
+ - ** DO NOT COMMIT **
+ -}
+import qualified Data.Text.Lazy.Builder
+import qualified Text.Shakespeare
+import qualified Text.Hamlet
+import qualified Text.Julius
+import qualified "blaze-markup" Text.Blaze.Internal
+import qualified Data.Monoid
+import qualified Yesod.Widget
+{- End EvilSplicer headers. -}
+
+