Merge branch 'miscfixes4' into 'master'
Misc fixups for failed builds, see refs See merge request fdroid/fdroiddata!5873
This commit is contained in:
commit
7389f05804
|
@ -202,6 +202,7 @@ Builds:
|
||||||
subdir: app
|
subdir: app
|
||||||
gradle:
|
gradle:
|
||||||
- yes
|
- yes
|
||||||
|
ndk: r16b
|
||||||
|
|
||||||
AutoUpdateMode: Version filemanager-%v
|
AutoUpdateMode: Version filemanager-%v
|
||||||
UpdateCheckMode: Tags
|
UpdateCheckMode: Tags
|
||||||
|
|
|
@ -54,7 +54,6 @@ Builds:
|
||||||
|
|
||||||
- versionName: 0.17.4
|
- versionName: 0.17.4
|
||||||
versionCode: 174
|
versionCode: 174
|
||||||
disable: fails to build
|
|
||||||
commit: 0.17.4
|
commit: 0.17.4
|
||||||
subdir: VirtualApp/app/
|
subdir: VirtualApp/app/
|
||||||
submodules: true
|
submodules: true
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
AntiFeatures:
|
||||||
|
- NonFreeNet
|
||||||
Categories:
|
Categories:
|
||||||
- Money
|
- Money
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
|
|
|
@ -240,19 +240,20 @@ Builds:
|
||||||
|
|
||||||
- versionName: 1.31.1
|
- versionName: 1.31.1
|
||||||
versionCode: 42
|
versionCode: 42
|
||||||
|
disable: broken build, missing ssl_helper
|
||||||
commit: 1.31.1
|
commit: 1.31.1
|
||||||
subdir: app
|
subdir: app
|
||||||
gradle:
|
gradle:
|
||||||
- yes
|
- yes
|
||||||
rm:
|
rm:
|
||||||
- app/src/main/assets/arm
|
- app/src/main/assets/arm
|
||||||
- app/src/main/assets/mips
|
- app/src/main/assets/arm64
|
||||||
- app/src/main/assets/x86
|
- app/src/main/assets/x86
|
||||||
build:
|
build:
|
||||||
- cd ../contrib
|
- cd ../contrib
|
||||||
- export ANDROID_NDK_ROOT=$$NDK$$
|
- export ANDROID_NDK_ROOT=$$NDK$$
|
||||||
- ./bb-build.sh arm static
|
- ./bb-build.sh arm static
|
||||||
- ./bb-build.sh mips static
|
- ./bb-build.sh arm64 static
|
||||||
- ./bb-build.sh x86 static
|
- ./bb-build.sh x86 static
|
||||||
- mv compiled/* ../app/src/main/assets/
|
- mv compiled/* ../app/src/main/assets/
|
||||||
ndk: r10e
|
ndk: r10e
|
||||||
|
|
|
@ -49,6 +49,7 @@ Builds:
|
||||||
|
|
||||||
- versionName: '3.1'
|
- versionName: '3.1'
|
||||||
versionCode: 8
|
versionCode: 8
|
||||||
|
disable: fails to build
|
||||||
commit: '3.1'
|
commit: '3.1'
|
||||||
subdir: app
|
subdir: app
|
||||||
gradle:
|
gradle:
|
||||||
|
|
Loading…
Reference in a new issue