NDK 21d fixes

This commit is contained in:
Licaon_Kter 2020-06-18 14:16:01 +03:00
parent 2a96738260
commit 1540d54f40
8 changed files with 9 additions and 18 deletions

View file

@ -405,10 +405,11 @@ Builds:
- sed -i -e '/^#!/a\set -e' -e 's|git clone .*|ln -s $$MuPDF$$ mupdf-$VERSION|'
-e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
- mkdir src/main/jniLibs/
- sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
build:
- pushd ../Builder/
- ./link_to_mupdf_1.16.1.sh
ndk: r21c
ndk: r21d
MaintainerNotes: Upstream builds separate APKs for each architecture but we build
an universal APK.

View file

@ -550,7 +550,7 @@ Builds:
rm:
- tools
- docs
ndk: r21b
ndk: r21d
MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).

View file

@ -585,7 +585,7 @@ Builds:
subdir: app
gradle:
- yes
ndk: r21b
ndk: r21d
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags

View file

@ -2578,16 +2578,6 @@ Builds:
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21b
- versionName: '1.1206'
versionCode: 1206
commit: '1.1206'
subdir: app
submodules: true
gradle:
- fdroid
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21b
- versionName: '1.1207'
versionCode: 1207
commit: '1.1207'
@ -2596,7 +2586,7 @@ Builds:
gradle:
- fdroid
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21b
ndk: r21d
AutoUpdateMode: Version %v
UpdateCheckMode: Tags

View file

@ -1238,7 +1238,7 @@ Builds:
gradle:
- yes
prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
ndk: r21b
ndk: r21d
AutoUpdateMode: Version %v
UpdateCheckMode: Tags ^[0-9.]+$

View file

@ -1860,7 +1860,7 @@ Builds:
prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
-e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
'/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
ndk: r21b
ndk: r21d
MaintainerNotes: |-
For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but

View file

@ -53,7 +53,7 @@ Builds:
gradle:
- fdroid
prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' build.gradle
ndk: r21b
ndk: r21d
AutoUpdateMode: Version %c
UpdateCheckMode: Tags ^[0-9]+$

View file

@ -116,7 +116,7 @@ Builds:
- gradle jar
buildjni:
- ../libraries/humla/src/main/jni
ndk: r21b
ndk: r21d
AutoUpdateMode: Version %v
UpdateCheckMode: Tags ^[^-]*$