Merge branch 'equeim/fdroiddata-tremotesf'

This commit is contained in:
relan 2018-08-02 08:51:09 +03:00
commit 8775be22a7

View file

@ -100,14 +100,14 @@ Build:1.7.1,17
commit=1.7.1 commit=1.7.1
subdir=app subdir=app
gradle=fdroid gradle=fdroid
srclibs=OpenSSL@OpenSSL_1_0_2o,QtBase@v5.9.6 srclibs=OpenSSL@OpenSSL_1_1_0h,QtBase@v5.11.1
prebuild=sed -i -e '/splits/,+7d' build.gradle && \ prebuild=sed -i -e '/splits/,+7d' build.gradle && \
sed -i -e 's/android:extractNativeLibs=\"false\"/android:extractNativeLibs=\"true\"/' src/main/AndroidManifest.xml && \ sed -i -e 's/android:extractNativeLibs=\"false\"/android:extractNativeLibs=\"true\"/' src/main/AndroidManifest.xml && \
sed -i -e "806s/\"\$MAKE\"/\"\$MAKE\" -j $(nproc)/" $$QtBase$$/configure && \ sed -i -e "806s/\"\$MAKE\"/\"\$MAKE\" -j $(nproc)/" $$QtBase$$/configure && \
ln -s $(realpath $$OpenSSL$$) ../3rdparty/openssl/openssl && \ ln -s $(realpath $$OpenSSL$$) ../3rdparty/openssl/openssl && \
ln -s $(realpath $$QtBase$$) ../3rdparty/qt/qtbase ln -s $(realpath $$QtBase$$) ../3rdparty/qt/qtbase
build=ANDROID_SDK_ROOT="$$SDK$$" ANDROID_NDK_ROOT="$$NDK$$" ../build-native.sh -j $(nproc) build=ANDROID_SDK_ROOT="$$SDK$$" ANDROID_NDK_ROOT="$$NDK$$" ../build-native.sh -j $(nproc)
ndk=r15c ndk=r17b
Auto Update Mode:Version %v Auto Update Mode:Version %v
Update Check Mode:Tags Update Check Mode:Tags