Merge branch 'update_oc' into 'master'

Update ownCloud to 1.7.2 (10700200)

Currently untested due to the lack of a clean buildserver but build should work.

See merge request !881
This commit is contained in:
Boris Kraut 2015-07-22 07:48:43 +00:00
commit 17ca8efefa

View file

@ -179,9 +179,25 @@ Build:1.7.1,10700100
android update lib-project -p ./ && \ android update lib-project -p ./ && \
echo "android.library=true" >> project.properties echo "android.library=true" >> project.properties
Build:1.7.2,10700200
commit=oc-android-1.7.2
submodules=yes
srclibs=2:Support/v7/appcompat@android-4.4.4_r2.0.1,3:TouchImageView@v1.2.0,DiskLruCache@disklrucache-2.0.2
rm=libs
extlibs=android/android-support-v4.jar
prebuild=cp libs/android-support-v4.jar $$Support$$/libs/ && \
cp -fR $$DiskLruCache$$/src/main/java/com src/ && \
mv libs/android-support-v4.jar $$TouchImageView$$/libs/ && \
pushd $$TouchImageView$$ && \
android update lib-project -p ./ && \
echo "android.library=true" >> project.properties
Maintainer Notes: Maintainer Notes:
Switch to the gradle flavor once all deps are pulled from central. Switch to the gradle flavor once all deps are pulled from central.
owncloud-android-library should be cleaned up from .jar files like
in fr.unix_experience.owncloud_sms.txt
Re-enable AUM when upstream tags follow a predictable scheme again. Re-enable AUM when upstream tags follow a predictable scheme again.
. .