Commit e592d5f8 authored by Marcus's avatar Marcus 🐲
Browse files

add ndk r12b to any buildjni build that doesn't have an ndk

r12b has been forever the default. Let's explicitly request that version
where we know we need it.

Note; there's other builds that still implicitly rely on that version
that don't use the buildjni flag. We don't really have a good way of
finding those, except manually.
parent 258450cb
Pipeline #215501009 failed with stage
in 5 minutes and 55 seconds
......@@ -23,6 +23,7 @@ Builds:
commit: '49'
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: Static
......
......@@ -31,6 +31,7 @@ Builds:
commit: '523'
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: None
......
......@@ -30,6 +30,7 @@ Builds:
commit: 161096295b4d4
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: RepoManifest
......
......@@ -21,6 +21,7 @@ Builds:
build: cp $$NDK$$/platforms/android-14/arch-arm/usr/lib/liblog.so jni/
buildjni:
- yes
ndk: r12b
MaintainerNotes: Substituting binary in jni/ with one from the NDK
......
......@@ -29,6 +29,7 @@ Builds:
- assets/*/*/buttonmask.bin
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: RepoManifest
......
......@@ -23,6 +23,7 @@ Builds:
commit: '189'
buildjni:
- yes
ndk: r12b
- versionName: '1.97'
versionCode: 43
......@@ -34,6 +35,7 @@ Builds:
commit: '198'
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: None
......
......@@ -63,6 +63,7 @@ Builds:
target: android-8
buildjni:
- yes
ndk: r12b
- versionName: 1.9.14
versionCode: 91
......@@ -71,6 +72,7 @@ Builds:
target: android-8
buildjni:
- yes
ndk: r12b
- versionName: 1.9.17
versionCode: 94
......@@ -79,6 +81,7 @@ Builds:
target: android-8
buildjni:
- yes
ndk: r12b
- versionName: 1.9.18.3
versionCode: 98
......@@ -90,6 +93,7 @@ Builds:
- cd ..
buildjni:
- yes
ndk: r12b
- versionName: 1.98.1
versionCode: 111
......@@ -101,6 +105,7 @@ Builds:
- cd ..
buildjni:
- yes
ndk: r12b
- versionName: 1.99.2
versionCode: 116
......@@ -111,6 +116,7 @@ Builds:
- unzip sha2-07-01-07.zip -d sha
buildjni:
- yes
ndk: r12b
- versionName: 1.99.4
versionCode: 120
......@@ -121,6 +127,7 @@ Builds:
- unzip sha2-07-01-07.zip -d sha
buildjni:
- yes
ndk: r12b
- versionName: 1.99.5
versionCode: 121
......@@ -132,6 +139,7 @@ Builds:
target: android-12
buildjni:
- yes
ndk: r12b
- versionName: 1.99.6
versionCode: 122
......@@ -143,6 +151,7 @@ Builds:
- rm libs/sha2-07-01-07.zip
buildjni:
- yes
ndk: r12b
- versionName: 1.99.7.2
versionCode: 125
......@@ -154,6 +163,7 @@ Builds:
- rm libs/sha2-07-01-07.zip
buildjni:
- yes
ndk: r12b
- versionName: 1.99.8
versionCode: 126
......@@ -165,6 +175,7 @@ Builds:
- rm libs/sha2-07-01-07.zip
buildjni:
- yes
ndk: r12b
- versionName: 1.99.9
versionCode: 127
......@@ -176,6 +187,7 @@ Builds:
- rm libs/sha2-07-01-07.zip
buildjni:
- yes
ndk: r12b
- versionName: 1.99.10
versionCode: 128
......@@ -186,6 +198,7 @@ Builds:
target: android-12
buildjni:
- yes
ndk: r12b
- versionName: 1.99.11
versionCode: 129
......@@ -196,6 +209,7 @@ Builds:
target: android-12
buildjni:
- yes
ndk: r12b
- versionName: '2.0'
versionCode: 130
......@@ -206,6 +220,7 @@ Builds:
target: android-12
buildjni:
- yes
ndk: r12b
- versionName: 2.0.2
versionCode: 135
......@@ -216,6 +231,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.3
versionCode: 136
......@@ -226,6 +242,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.4beta1
versionCode: 137
......@@ -236,6 +253,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.4
versionCode: 138
......@@ -246,6 +264,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.5beta1
versionCode: 139
......@@ -257,6 +276,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.6.1
versionCode: 151
......@@ -272,6 +292,7 @@ Builds:
- sh prep_build.sh
buildjni:
- yes
ndk: r12b
- versionName: 2.0.6.3
versionCode: 153
......
......@@ -27,6 +27,7 @@ Builds:
target: android-15
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: Tags
......
......@@ -25,6 +25,7 @@ Builds:
target: android-15
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: Tags
......
......@@ -35,6 +35,7 @@ Builds:
target: android-15
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: Tags
......
......@@ -49,6 +49,7 @@ Builds:
- sed -i 's@\(android.library.reference.1=\).*@\1$$AndrozicLib$$@' project.properties
buildjni:
- yes
ndk: r12b
- versionName: 1.7.2
versionCode: 86
......@@ -60,6 +61,7 @@ Builds:
- sed -i 's@\(android.library.reference.1=\).*@\1$$AndrozicLib$$@' project.properties
buildjni:
- yes
ndk: r12b
- versionName: 1.7.6
versionCode: 90
......@@ -76,6 +78,7 @@ Builds:
- sed -i 's@\(reference.3=\).*@\1$$ShowCase-Androzic$$@' project.properties
buildjni:
- yes
ndk: r12b
- versionName: 1.7.8
versionCode: 94
......@@ -91,6 +94,7 @@ Builds:
- mv libs/android-support-v4.jar $$Support$$/libs
buildjni:
- AndrozicLib
ndk: r12b
- versionName: 1.7.9
versionCode: 95
......@@ -106,6 +110,7 @@ Builds:
- mv libs/android-support-v4.jar $$Support$$/libs
buildjni:
- AndrozicLib
ndk: r12b
- versionName: 2.0.3
versionCode: 105
......
......@@ -39,6 +39,7 @@ Builds:
- cd android
buildjni:
- yes
ndk: r12b
- versionName: 1.2-ARM
versionCode: 50
......@@ -52,6 +53,7 @@ Builds:
- make generate
buildjni:
- yes
ndk: r12b
- versionName: 1.2-x86
versionCode: 51
......@@ -67,6 +69,7 @@ Builds:
- make generate
buildjni:
- yes
ndk: r12b
- versionName: 1.2-MIPS
versionCode: 52
......@@ -82,6 +85,7 @@ Builds:
- make generate
buildjni:
- yes
ndk: r12b
- versionName: '1.5'
versionCode: 53
......@@ -98,6 +102,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.5'
versionCode: 54
......@@ -114,6 +119,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.5'
versionCode: 55
......@@ -130,6 +136,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.6'
versionCode: 61
......@@ -146,6 +153,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.6'
versionCode: 62
......@@ -162,6 +170,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.6'
versionCode: 63
......@@ -178,6 +187,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.7'
versionCode: 71
......@@ -194,6 +204,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.7'
versionCode: 72
......@@ -210,6 +221,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.7'
versionCode: 73
......@@ -226,6 +238,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: 1.7a
versionCode: 76
......@@ -242,6 +255,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: 1.7a
versionCode: 77
......@@ -258,6 +272,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: 1.7a
versionCode: 78
......@@ -274,6 +289,7 @@ Builds:
- build/debug/
buildjni:
- yes
ndk: r12b
- versionName: '1.8'
versionCode: 81
......@@ -291,6 +307,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.8'
versionCode: 82
......@@ -308,6 +325,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.8'
versionCode: 83
......@@ -325,6 +343,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.9'
versionCode: 91
......@@ -342,6 +361,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.9'
versionCode: 92
......@@ -359,6 +379,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.9'
versionCode: 93
......@@ -376,6 +397,7 @@ Builds:
- thirdparty/curl/tests/data/test*
buildjni:
- yes
ndk: r12b
- versionName: '1.10'
versionCode: 101
......
......@@ -168,6 +168,7 @@ Builds:
- src/main/libs/armeabi/*
buildjni:
- src/main/jni
ndk: r12b
- versionName: '7.06'
versionCode: 63
......@@ -180,6 +181,7 @@ Builds:
- src/main/libs/armeabi/*
buildjni:
- src/main/jni
ndk: r12b
MaintainerNotes: |-
* 7.06: Upstream moved all dependencies but volley.jar to gradle; don't use tag due to a last-minute change.
......
......@@ -46,6 +46,7 @@ Builds:
- ./buildall.sh
buildjni:
- ../library
ndk: r12b
MaintainerNotes: Android manifest has no version info, so no UCM applies.
......
......@@ -32,6 +32,7 @@ Builds:
- sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
buildjni:
- yes
ndk: r12b
- versionName: 1.1.1
versionCode: 6
......@@ -39,6 +40,7 @@ Builds:
prebuild: sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
buildjni:
- yes
ndk: r12b
- versionName: 1.1.2
versionCode: 7
......@@ -52,6 +54,7 @@ Builds:
prebuild: sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
buildjni:
- yes
ndk: r12b
- versionName: 1.1.3
versionCode: 8
......@@ -65,6 +68,7 @@ Builds:
prebuild: sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
buildjni:
- yes
ndk: r12b
- versionName: 1.1.5
versionCode: 10
......@@ -73,6 +77,7 @@ Builds:
- libs/
buildjni:
- yes
ndk: r12b
- versionName: 1.1.6
versionCode: 11
......@@ -81,6 +86,7 @@ Builds:
- libs/
buildjni:
- yes
ndk: r12b
- versionName: 1.2.4
versionCode: 16
......
......@@ -27,6 +27,7 @@ Builds:
prebuild: echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
buildjni:
- yes
ndk: r12b
- versionName: 1.5.0
versionCode: 15
......
......@@ -43,6 +43,7 @@ Builds:
- jni/libspectrum-0.5.0.1/make-perl
buildjni:
- yes
ndk: r12b
MaintainerNotes: |-
Not suitable for F-Droid repo due to assets licensing issues.
......
......@@ -35,6 +35,7 @@ Builds:
- name-no-gmaps.patch
buildjni:
- yes
ndk: r12b
- versionName: 3.0.6.4
versionCode: 41
......
......@@ -63,6 +63,7 @@ Builds:
- cp extra/system.jar libs/
buildjni:
- yes
ndk: r12b
- versionName: '3.4'
versionCode: 3040
......@@ -72,6 +73,7 @@ Builds:
- cp extra/system.jar libs/
buildjni:
- yes
ndk: r12b
- versionName: 3.4.2
versionCode: 3042
......@@ -86,6 +88,7 @@ Builds:
- cp extra/system.jar libs/
buildjni:
- yes
ndk: r12b
- versionName: 3.4.3
versionCode: 3043
......@@ -101,6 +104,7 @@ Builds:
- cp extra/system.jar libs/
buildjni:
- yes
ndk: r12b
- versionName: 3.7.1
versionCode: 3071
......
......@@ -31,6 +31,7 @@ Builds:
forceversion: true
buildjni:
- yes
ndk: r12b
AutoUpdateMode: None
UpdateCheckMode: None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment