diff --git a/debian/changelog b/debian/changelog index 8c28323f84..2e0e3cf801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ git-annex (4.20130921) UNRELEASED; urgency=low * Use cryptohash rather than SHA for hashing when no external hash program is available. This is a significant speedup for SHA256 on OSX, for example. + * Android build redone from scratch, many dependencies updated, + and entire build can now be done using provided scripts. -- Joey Hess Sun, 22 Sep 2013 19:42:29 -0400 diff --git a/standalone/android/Makefile b/standalone/android/Makefile index bf1802ca63..494b052c09 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -121,7 +121,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/build-stamp: touch $@ $(GIT_ANNEX_ANDROID_SOURCETREE)/term/build-stamp: term.patch icons - cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && git reset --hard + # This is a known-good version that the patch works with. + cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && git reset --hard 3d34b3c42295c215b62e70f3ee696dd664ba08ce cat term.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && patch -p1) (cd icons && tar c .) | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term/res && tar x) # This renaming has a purpose. It makes the path to the app's