mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 10:40:10 +02:00
Add ndk r11c
This commit is contained in:
parent
ec685342a4
commit
815961acc5
@ -2,6 +2,7 @@ sdk_path = "/home/vagrant/android-sdk"
|
|||||||
ndk_paths = {
|
ndk_paths = {
|
||||||
'r9b': "/home/vagrant/android-ndk/r9b",
|
'r9b': "/home/vagrant/android-ndk/r9b",
|
||||||
'r10e': "/home/vagrant/android-ndk/r10e",
|
'r10e': "/home/vagrant/android-ndk/r10e",
|
||||||
|
'r11c': "/home/vagrant/android-ndk/r11c",
|
||||||
'r12b': "/home/vagrant/android-ndk/r12b",
|
'r12b': "/home/vagrant/android-ndk/r12b",
|
||||||
}
|
}
|
||||||
java_paths = {
|
java_paths = {
|
||||||
|
@ -20,6 +20,11 @@ if [ ! -e $NDK_BASE/r10e ]; then
|
|||||||
mv android-ndk-r10e r10e
|
mv android-ndk-r10e r10e
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! -e $NDK_BASE/r11c ]; then
|
||||||
|
unzip /vagrant/cache/android-ndk-r11c-linux-x86_64.zip > /dev/null
|
||||||
|
mv android-ndk-r11c r11c
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -e $NDK_BASE/r12b ]; then
|
if [ ! -e $NDK_BASE/r12b ]; then
|
||||||
unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /dev/null
|
unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /dev/null
|
||||||
mv android-ndk-r12b r12b
|
mv android-ndk-r12b r12b
|
||||||
|
@ -1125,7 +1125,7 @@ Version of the NDK to use in this build. Defaults to the latest NDK release
|
|||||||
that included legacy toolchains, so as to not break builds that require
|
that included legacy toolchains, so as to not break builds that require
|
||||||
toolchains no longer included in current versions of the NDK.
|
toolchains no longer included in current versions of the NDK.
|
||||||
|
|
||||||
The buildserver supports r9b with its legacy toolchains, r10e and the
|
The buildserver supports r9b with its legacy toolchains, r10e, r11c and the
|
||||||
latest release as of writing this document, r12b. You may add support
|
latest release as of writing this document, r12b. You may add support
|
||||||
for more versions by adding them to 'ndk_paths' in your config file.
|
for more versions by adding them to 'ndk_paths' in your config file.
|
||||||
|
|
||||||
|
@ -6,13 +6,14 @@
|
|||||||
# Custom path to the Android SDK, defaults to $ANDROID_HOME
|
# Custom path to the Android SDK, defaults to $ANDROID_HOME
|
||||||
# sdk_path = "$ANDROID_HOME"
|
# sdk_path = "$ANDROID_HOME"
|
||||||
|
|
||||||
# Custom paths to various versions of the Android NDK, defaults to 'r10e' set
|
# Custom paths to various versions of the Android NDK, defaults to 'r12b' set
|
||||||
# to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is
|
# to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is
|
||||||
# used by default. If a version is missing or assigned to None, it is assumed
|
# used by default. If a version is missing or assigned to None, it is assumed
|
||||||
# not installed.
|
# not installed.
|
||||||
# ndk_paths = {
|
# ndk_paths = {
|
||||||
# 'r9b': None,
|
# 'r9b': None,
|
||||||
# 'r10e': None,
|
# 'r10e': None,
|
||||||
|
# 'r11c': None,
|
||||||
# 'r12b': "$ANDROID_NDK",
|
# 'r12b': "$ANDROID_NDK",
|
||||||
# }
|
# }
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ default_config = {
|
|||||||
'ndk_paths': {
|
'ndk_paths': {
|
||||||
'r9b': None,
|
'r9b': None,
|
||||||
'r10e': None,
|
'r10e': None,
|
||||||
|
'r11c': None,
|
||||||
'r12b': "$ANDROID_NDK",
|
'r12b': "$ANDROID_NDK",
|
||||||
},
|
},
|
||||||
'build_tools': "24.0.1",
|
'build_tools': "24.0.1",
|
||||||
|
@ -247,6 +247,8 @@ cachefiles = [
|
|||||||
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
|
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
|
||||||
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
|
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
|
||||||
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
|
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
|
||||||
|
('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
|
||||||
|
'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
|
||||||
('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
|
('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
|
||||||
'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
|
'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
|
||||||
]
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user