summaryrefslogtreecommitdiff
path: root/standalone/android/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-05 12:29:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-05 12:29:20 -0400
commitc9063945e08500a9a9c9f297b7c9985f22122c37 (patch)
treedc026781255ded73e67fcb2c31210261c80318e4 /standalone/android/Makefile
parent418c4316d718184574f7a3b136eabfaf9d92d9d3 (diff)
Android: Provide a version built with -fPIE -pie to support Android 5.0.
Diffstat (limited to 'standalone/android/Makefile')
-rw-r--r--standalone/android/Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 3bf12dcde..d787fe0ff 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -78,17 +78,13 @@ build: start
git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so
cp ../trustedkeys.gpg $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.trustedkeys.so
- mkdir -p ../../tmp/4.0 ../../tmp/4.3
-
- cp ../../tmp/androidtree/dist/build/git-annex/4.3/git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
- arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
- cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug
- cp $(GIT_ANNEX_ANDROID_SOURCETREE)/term/bin/Term-debug.apk ../../tmp/4.3/git-annex.apk
-
- cp ../../tmp/androidtree/dist/build/git-annex/4.0/git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
- arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so
- cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug
- cp $(GIT_ANNEX_ANDROID_SOURCETREE)/term/bin/Term-debug.apk ../../tmp/4.0/git-annex.apk
+ for v in 4.0 4.3 5.0; do \
+ mkdir -p ../../tmp/$$v; \
+ cp ../../tmp/androidtree/dist/build/git-annex/$$v/git-annex $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so; \
+ arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git-annex.so; \
+ cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug; \
+ cp $(GIT_ANNEX_ANDROID_SOURCETREE)/term/bin/Term-debug.apk ../../tmp/$$v/git-annex.apk; \
+ done
$(GIT_ANNEX_ANDROID_SOURCETREE)/openssl/build-stamp:
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android