mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'ndk14' into 'master'
makebs: add ndk r14 See merge request !231
This commit is contained in:
commit
71ff1d6257
@ -5,6 +5,7 @@ ndk_paths = {
|
||||
'r11c': "/home/vagrant/android-ndk/r11c",
|
||||
'r12b': "/home/vagrant/android-ndk/r12b",
|
||||
'r13b': "/home/vagrant/android-ndk/r13b",
|
||||
'r14': "/home/vagrant/android-ndk/r14",
|
||||
}
|
||||
qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7"
|
||||
java_paths = {
|
||||
|
@ -35,5 +35,10 @@ if [ ! -e $NDK_BASE/r13b ]; then
|
||||
mv android-ndk-r13b r13b
|
||||
fi
|
||||
|
||||
if [ ! -e $NDK_BASE/r14 ]; then
|
||||
unzip /vagrant/cache/android-ndk-r14-linux-x86_64.zip > /dev/null
|
||||
mv android-ndk-r14 r14
|
||||
fi
|
||||
|
||||
chmod -R a+rX $NDK_BASE/
|
||||
find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x
|
||||
|
@ -16,6 +16,7 @@
|
||||
# 'r11c': None,
|
||||
# 'r12b': "$ANDROID_NDK",
|
||||
# 'r13b': None,
|
||||
# 'r14': None,
|
||||
# }
|
||||
|
||||
# Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7"
|
||||
|
@ -62,6 +62,7 @@ default_config = {
|
||||
'r11c': None,
|
||||
'r12b': "$ANDROID_NDK",
|
||||
'r13b': None,
|
||||
'r14': None,
|
||||
},
|
||||
'qt_sdk_path': None,
|
||||
'build_tools': "25.0.2",
|
||||
|
@ -305,6 +305,8 @@ cachefiles = [
|
||||
'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
|
||||
('https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip',
|
||||
'3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
|
||||
('https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip',
|
||||
'3e622c2c9943964ea44cd56317d0769ed4c811bb4b40dc45b1f6965e4db9aa44'),
|
||||
('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
|
||||
'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user