diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py index 0956f52ebf1a..64cd486430d1 100644 --- a/python/mozboot/mozboot/android.py +++ b/python/mozboot/mozboot/android.py @@ -258,13 +258,13 @@ def suggest_mozconfig(sdk_path=None, ndk_path=None, artifact_mode=False): print(MOBILE_ANDROID_MOZCONFIG_TEMPLATE % (sdk_path, ndk_path)) -def android_ndk_url(os_name, ver='r10e'): - # Produce a URL like 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin'. - base_url = 'https://dl.google.com/android/ndk/android-ndk' +def android_ndk_url(os_name, ver='r11b'): + # Produce a URL like 'https://dl.google.com/android/repository/android-ndk-r11b-linux-x86_64.zip + base_url = 'https://dl.google.com/android/repository/android-ndk' if sys.maxsize > 2**32: arch = 'x86_64' else: arch = 'x86' - return '%s-%s-%s-%s.bin' % (base_url, ver, os_name, arch) + return '%s-%s-%s-%s.zip' % (base_url, ver, os_name, arch) diff --git a/python/mozboot/mozboot/archlinux.py b/python/mozboot/mozboot/archlinux.py index a2100127fca7..817528186076 100644 --- a/python/mozboot/mozboot/archlinux.py +++ b/python/mozboot/mozboot/archlinux.py @@ -114,10 +114,10 @@ class ArchlinuxBootstrapper(BaseBootstrapper): # 2. The user may have an external Android SDK (in which case we save # them a lengthy download), or they may have already completed the - # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r10e}. + # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r11b}. mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH', os.path.expanduser(os.path.join('~', '.mozbuild'))) self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux')) - self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e')) + self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r11b')) self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz' self.ndk_url = android.android_ndk_url('linux') diff --git a/python/mozboot/mozboot/centosfedora.py b/python/mozboot/mozboot/centosfedora.py index 9c5b786107a7..3e1ada9b7489 100644 --- a/python/mozboot/mozboot/centosfedora.py +++ b/python/mozboot/mozboot/centosfedora.py @@ -114,7 +114,7 @@ class CentOSFedoraBootstrapper(BaseBootstrapper): # Fetch Android SDK and NDK. mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH', os.path.expanduser(os.path.join('~', '.mozbuild'))) self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux')) - self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e')) + self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r11b')) self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz' self.ndk_url = android.android_ndk_url('linux') diff --git a/python/mozboot/mozboot/debian.py b/python/mozboot/mozboot/debian.py index 737646ed2533..eb7d17d3a931 100644 --- a/python/mozboot/mozboot/debian.py +++ b/python/mozboot/mozboot/debian.py @@ -126,10 +126,10 @@ class DebianBootstrapper(BaseBootstrapper): # 2. The user may have an external Android SDK (in which case we save # them a lengthy download), or they may have already completed the - # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r10e}. + # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r11b}. mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH', os.path.expanduser(os.path.join('~', '.mozbuild'))) self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux')) - self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e')) + self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r11b')) self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz' self.ndk_url = android.android_ndk_url('linux') diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py index 7a774e57529c..a0a9e744a8a9 100644 --- a/python/mozboot/mozboot/osx.py +++ b/python/mozboot/mozboot/osx.py @@ -356,10 +356,10 @@ class OSXBootstrapper(BaseBootstrapper): # 2. The user may have an external Android SDK (in which case we save # them a lengthy download), or they may have already completed the - # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r10e}. + # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r11b}. mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH', os.path.expanduser(os.path.join('~', '.mozbuild'))) self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-macosx')) - self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e')) + self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r11b')) self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-macosx.zip' is_64bits = sys.maxsize > 2**32 if is_64bits: @@ -438,10 +438,10 @@ class OSXBootstrapper(BaseBootstrapper): # 2. The user may have an external Android SDK (in which case we save # them a lengthy download), or they may have already completed the - # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r10e}. + # download. We unpack to ~/.mozbuild/{android-sdk-linux, android-ndk-r11b}. mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH', os.path.expanduser(os.path.join('~', '.mozbuild'))) self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-macosx')) - self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e')) + self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r11b')) self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-macosx.zip' is_64bits = sys.maxsize > 2**32 if is_64bits: