mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 15:02:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace NDK r10d with r10e

Browse source
This commit is contained in:
Daniel Martí 2015-06-18 17:05:48 +02:00
parent 5985bb4a0b
commit 52c2ca1fe7
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/config.buildserver.py
View file

@ -1,7 +1,7 @@
sdk_path = "/home/vagrant/android-sdk" sdk_path = "/home/vagrant/android-sdk"
ndk_paths = { ndk_paths = {
'r9b': "/home/vagrant/android-ndk/r9b", 'r9b': "/home/vagrant/android-ndk/r9b",
'r10d': "/home/vagrant/android-ndk/r10d" 'r10e': "/home/vagrant/android-ndk/r10e"
} }
build_tools = "22.0.1" build_tools = "22.0.1"
ant = "ant" ant = "ant"

10
buildserver/cookbooks/android-ndk/recipes/default.rb
View file

@ -35,7 +35,7 @@ script "setup-android-ndk-r9b" do
end end
end end
script "setup-android-ndk-r10d" do script "setup-android-ndk-r10e" do
timeout 14400 timeout 14400
interpreter "bash" interpreter "bash"
user node[:settings][:user] user node[:settings][:user]
@ -46,12 +46,12 @@ script "setup-android-ndk-r10d" do
else else
SUFFIX='' SUFFIX=''
fi fi
chmod u+x /vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin chmod u+x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
/vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x
mv android-ndk-r10d #{ndk_loc}/r10d mv android-ndk-r10e #{ndk_loc}/r10e
" "
not_if do not_if do
File.exists?("#{ndk_loc}/r10d") File.exists?("#{ndk_loc}/r10e")
end end
end end

2
docs/fdroid.texi
View file

@ -1008,7 +1008,7 @@ 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 and the latest release The buildserver supports r9b with its legacy toolchains and the latest release
as of writing this document, r10d. You may add support for more versions by as of writing this document, r10e. You may add support for more versions by
adding them to 'ndk_paths' in your config file. adding them to 'ndk_paths' in your config file.
@item gradle=<flavour1>[,<flavour2>,...] @item gradle=<flavour1>[,<flavour2>,...]

2
examples/config.py
View file

@ -11,7 +11,7 @@ sdk_path = "$ANDROID_HOME"
# If a version is missing or assigned to None, it is assumed not installed # If a version is missing or assigned to None, it is assumed not installed
ndk_paths = { ndk_paths = {
'r9b': None, 'r9b': None,
'r10d': "$ANDROID_NDK" 'r10e': "$ANDROID_NDK"
} }
# Build tools version to be used # Build tools version to be used

4
fdroidserver/common.py
View file

@ -51,7 +51,7 @@ default_config = {
'sdk_path': "$ANDROID_HOME", 'sdk_path': "$ANDROID_HOME",
'ndk_paths': { 'ndk_paths': {
'r9b': None, 'r9b': None,
'r10d': "$ANDROID_NDK" 'r10e': "$ANDROID_NDK"
}, },
'build_tools': "22.0.1", 'build_tools': "22.0.1",
'ant': "ant", 'ant': "ant",
@ -194,7 +194,7 @@ def read_config(opts, config_file='config.py'):
def get_ndk_path(version): def get_ndk_path(version):
if version is None: if version is None:
version = 'r10d' # latest version = 'r10e' # latest
paths = config['ndk_paths'] paths = config['ndk_paths']
if version not in paths: if version not in paths:
return '' return ''

2
fdroidserver/init.py
View file

@ -228,7 +228,7 @@ def main():
logging.info(' Android SDK:\t\t\t' + config['sdk_path']) logging.info(' Android SDK:\t\t\t' + config['sdk_path'])
if aapt: if aapt:
logging.info(' Android SDK Build Tools:\t' + os.path.dirname(aapt)) logging.info(' Android SDK Build Tools:\t' + os.path.dirname(aapt))
logging.info(' Android NDK r10d (optional):\t$ANDROID_NDK') logging.info(' Android NDK r10e (optional):\t$ANDROID_NDK')
logging.info(' Keystore for signing key:\t' + keystore) logging.info(' Keystore for signing key:\t' + keystore)
if repo_keyalias is not None: if repo_keyalias is not None:
logging.info(' Alias for key in store:\t' + repo_keyalias) logging.info(' Alias for key in store:\t' + repo_keyalias)

12
makebuildserver
View file

@ -108,9 +108,9 @@ cachefiles = [
if config['arch64']: if config['arch64']:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r10d-linux-x86_64.bin', ('android-ndk-r10e-linux-x86_64.bin',
'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin', 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
'812949f9299afd4b91890863054dc42f6547b6d485211d5f0faca9f286685df6'), '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
('android-ndk-r9b-linux-x86_64.tar.bz2', ('android-ndk-r9b-linux-x86_64.tar.bz2',
'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'), '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
@ -119,9 +119,9 @@ if config['arch64']:
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')]) 'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
else: else:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r10d-linux-x86.bin', ('android-ndk-r10e-linux-x86.bin',
'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin', 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin',
'c0d07e5ce2fff13b5eb456c10e99527184c9139e798cb7fd1adfadafa65cb696'), '92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5'),
('android-ndk-r9b-linux-x86.tar.bz2', ('android-ndk-r9b-linux-x86.tar.bz2',
'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
'748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'), '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),