diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-26 13:24:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-26 13:24:24 -0400 |
| commit | 8b79b8f3acdfc94233dc6f389013168d6a4d5013 (patch) | |
| tree | 574c6bc463909d1c3056f735f261376097ad2479 | |
| parent | 01c0042f39068e43443e667edbde15205f738608 (diff) | |
2 android bug fixes
4 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ee18b4450..0a4734b65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ git-annex (5.20131121) UNRELEASED; urgency=low * Bug fix: annex.version did not get set on automatic upgrade to v5 direct mode repo, so the upgrade was performed repeatedly, slowing commands down. + * Android: Fix stripping of the git-annex binary. + * Android: Make terminal app show git-annex version number. -- Joey Hess <joeyh@debian.org> Wed, 20 Nov 2013 18:30:47 -0400 diff --git a/doc/bugs/Incorrect_version_of_Git_Annex___40__1.0.52__41___as_seen_by_Android.mdwn b/doc/bugs/Incorrect_version_of_Git_Annex___40__1.0.52__41___as_seen_by_Android.mdwn index fc17d62f0..95db65e25 100644 --- a/doc/bugs/Incorrect_version_of_Git_Annex___40__1.0.52__41___as_seen_by_Android.mdwn +++ b/doc/bugs/Incorrect_version_of_Git_Annex___40__1.0.52__41___as_seen_by_Android.mdwn @@ -20,3 +20,5 @@ android # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/size_of_the_Android_installation_is_HUGE_--_please_seek_possibility_to_shrink.mdwn b/doc/bugs/size_of_the_Android_installation_is_HUGE_--_please_seek_possibility_to_shrink.mdwn index 687047787..3f8c7fc48 100644 --- a/doc/bugs/size_of_the_Android_installation_is_HUGE_--_please_seek_possibility_to_shrink.mdwn +++ b/doc/bugs/size_of_the_Android_installation_is_HUGE_--_please_seek_possibility_to_shrink.mdwn @@ -35,3 +35,7 @@ Last-Modified: Mon, 18 Nov 2013 11:57:25 GMT # End of transcript or log. """]] + +> Seems that I lost stripping of the git-annex binary when adding the build +> for the newer android versions. [[fixed|done]] (There is not otherwise +> much way to shrink the size.) --[[Joey]] diff --git a/standalone/android/Makefile b/standalone/android/Makefile index d80d568db..f5cd67b26 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -15,6 +15,8 @@ GIT_ANNEX_ANDROID_SOURCETREE?=$(HOME)/.android/git-annex-sourcetree GITTREE=$(GIT_ANNEX_ANDROID_SOURCETREE)/git/installed-tree +VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<../../CHANGELOG) + build: start if [ ! -e "$(GIT_ANNEX_ANDROID_SOURCETREE)" ]; then $(MAKE) source; fi $(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl/build-stamp @@ -25,6 +27,8 @@ build: start $(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp $(MAKE) $(GIT_ANNEX_ANDROID_SOURCETREE)/term/build-stamp + perl -i -pe 's/(android:versionName=)"[^"]+"/$$1"'$(VER)'"/' $(GIT_ANNEX_ANDROID_SOURCETREE)/term/AndroidManifest.xml + # Debug build because it does not need signing keys. cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && tools/build-debug @@ -76,10 +80,12 @@ build: start 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 |