diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-05 12:29:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-05 12:29:20 -0400 |
| commit | c9063945e08500a9a9c9f297b7c9985f22122c37 (patch) | |
| tree | dc026781255ded73e67fcb2c31210261c80318e4 /Makefile | |
| parent | 418c4316d718184574f7a3b136eabfaf9d92d9d3 (diff) | |
Android: Provide a version built with -fPIE -pie to support Android 5.0.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -221,8 +221,8 @@ android: Build/EvilSplicer sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/androidtree/git-annex.cabal # Cabal cannot cross compile with custom build type, so workaround. sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal -# Build just once, but link twice, for 2 different versions of Android. - mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 +# Build just once, but link repeatedly, for different versions of Android. + mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 tmp/androidtree/dist/build/git-annex/5.0 if [ ! -e tmp/androidtree/dist/setup-config ]; then \ cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \ fi @@ -231,6 +231,9 @@ android: Build/EvilSplicer cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \ --ghc-options=-optl-z --ghc-options=-optlnocopyreloc \ && mv dist/build/git-annex/git-annex dist/build/git-annex/4.3/git-annex + cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \ + --ghc-options=-optl-z --ghc-options=-optlnocopyreloc --ghc-options=-optl-fPIE --ghc-options=-optl-pie \ + && mv dist/build/git-annex/git-annex dist/build/git-annex/5.0/git-annex androidapp: $(MAKE) android |