2 android bug fixes
This commit is contained in:
parent
3e9db00d2d
commit
1e515b76b3
4 changed files with 15 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue