Replace NDK r10d with r10e

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 6e29ff52b1f91d56a72261c8d9514b0337530073..98aa69c15ff55a083a75b9bf96a5525e827d49ea 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -1,7 +1,7 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_paths = {
     'r9b': "/home/vagrant/android-ndk/r9b",
-    'r10d': "/home/vagrant/android-ndk/r10d"
+    'r10e': "/home/vagrant/android-ndk/r10e"
 }
 build_tools = "22.0.1"
 ant = "ant"

diff --git a/buildserver/cookbooks/android-ndk/recipes/default.rb b/buildserver/cookbooks/android-ndk/recipes/default.rb
index 2d8cadfc945f6759311bc3058990d12be679a961..6fe9e11f6d0c47c0f9abbe0fd6b04c73046fa7a3 100644 (file)
--- a/buildserver/cookbooks/android-ndk/recipes/default.rb
+++ b/buildserver/cookbooks/android-ndk/recipes/default.rb
@@ -35,7 +35,7 @@ script "setup-android-ndk-r9b" do
   end
 end
 
-script "setup-android-ndk-r10d" do
+script "setup-android-ndk-r10e" do
   timeout 14400
   interpreter "bash"
   user node[:settings][:user]
@@ -46,12 +46,12 @@ script "setup-android-ndk-r10d" do
     else
        SUFFIX=''
     fi
-    chmod u+x /vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin
-    /vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin x
-    mv android-ndk-r10d #{ndk_loc}/r10d
+    chmod u+x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
+    /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x
+    mv android-ndk-r10e #{ndk_loc}/r10e
   "
   not_if do
-    File.exists?("#{ndk_loc}/r10d")
+    File.exists?("#{ndk_loc}/r10e")
   end
 end
 

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 2efd34c3aa55422e201bc6889049a141f0b4f67d..7de197ec6be4cd871edb45f52a01ecdae8ad3319 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -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.
 
 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.
 
 @item gradle=<flavour1>[,<flavour2>,...]

diff --git a/examples/config.py b/examples/config.py
index e87363f082c9813abe5bc96e3d3608b4fb8647b1..ccd0a5edf2ddb2b5ad654bcd93bda85132d4270f 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -11,7 +11,7 @@ sdk_path = "$ANDROID_HOME"
 # If a version is missing or assigned to None, it is assumed not installed
 ndk_paths = {
     'r9b': None,
-    'r10d': "$ANDROID_NDK"
+    'r10e': "$ANDROID_NDK"
 }
 
 # Build tools version to be used

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ec543faf9e16c8c3a0a6bf01a8ea7493f9df66c7..9e51ffdf09658e8c8a8bdacc4fbd1c9250c86b0c 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -51,7 +51,7 @@ default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_paths': {
         'r9b': None,
-        'r10d': "$ANDROID_NDK"
+        'r10e': "$ANDROID_NDK"
     },
     'build_tools': "22.0.1",
     'ant': "ant",
@@ -194,7 +194,7 @@ def read_config(opts, config_file='config.py'):
 
 def get_ndk_path(version):
     if version is None:
-        version = 'r10d'  # latest
+        version = 'r10e'  # latest
     paths = config['ndk_paths']
     if version not in paths:
         return ''

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index c49cb303a3932104923527d9da4c9e04e993ecc7..1e77e2fe5e479545c3b0164b93e1f32a354d76e2 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -228,7 +228,7 @@ def main():
     logging.info('  Android SDK:\t\t\t' + config['sdk_path'])
     if 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)
     if repo_keyalias is not None:
         logging.info('  Alias for key in store:\t' + repo_keyalias)

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