Merge branch 'master' into 'master'

Now no longer needs tangram library to be custom built. Uses tangram 9.0

See merge request fdroid/fdroiddata!2869
This commit is contained in:
relan 2018-02-02 05:23:12 +00:00
commit 1591cd5b65

View file

@ -391,16 +391,8 @@ Build:1.1.30,74
Build:1.1.34,77 Build:1.1.34,77
commit=v1.1.34 commit=v1.1.34
subdir=app subdir=app
submodules=yes
gradle=yes gradle=yes
prebuild=mkdir -p libs && \ scanignore=app/src/main/resources/org/joda/time/tz/data,app/src/main/assets/fonts
touch libs/tangram-full-release.aar #gradle clean will barf if this file doesn't exist
scanignore=app/src/main/resources/org/joda/time/tz/data
build=echo -e '#!/bin/sh\ngradle "$@"' > ../lib/tangram-es/platforms/android/gradlew && \
chmod +x ../lib/tangram-es/platforms/android/gradlew && \
../lib/tangram-es/android_aar_build.sh && \
cp ../lib/tangram-es/platforms/android/tangram/build/outputs/aar/tangram-full-release.aar libs/tangram-full-release.aar
ndk=r13b
Auto Update Mode:Version v%v Auto Update Mode:Version v%v
Update Check Mode:Tags Update Check Mode:Tags