Bug 1412677 - Install NDK r15c as part of 'mach bootstrap' r=froydnj draft
authorJames Willcox <snorp@snorp.net>
Mon, 30 Oct 2017 08:51:15 -0500
changeset 688741 1ca40bed72428a590e291bbfd355772f1eebe329
parent 688740 0b5ac6a7e979dde948bf74ef8967960b75892658
child 738148 d66cc6561b73f55e2942e43de820b8397b454a59
push id86833
push userbmo:snorp@snorp.net
push dateMon, 30 Oct 2017 15:43:22 +0000
reviewersfroydnj
bugs1412677
milestone58.0a1
Bug 1412677 - Install NDK r15c as part of 'mach bootstrap' r=froydnj MozReview-Commit-ID: A1aEUTWSDVm
python/mozboot/mozboot/android.py
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -132,17 +132,17 @@ def install_mobile_android_sdk_or_ndk(ur
 
 
 def get_paths(os_name):
     mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH',
                                    os.path.expanduser(os.path.join('~', '.mozbuild')))
     sdk_path = os.environ.get('ANDROID_SDK_HOME',
                               os.path.join(mozbuild_path, 'android-sdk-{0}'.format(os_name)))
     ndk_path = os.environ.get('ANDROID_NDK_HOME',
-                              os.path.join(mozbuild_path, 'android-ndk-r11c'))
+                              os.path.join(mozbuild_path, 'android-ndk-r15c'))
     return (mozbuild_path, sdk_path, ndk_path)
 
 
 def ensure_dir(dir):
     '''Ensures the given directory exists'''
     if dir and not os.path.exists(dir):
         try:
             os.makedirs(dir)
@@ -255,17 +255,17 @@ def ensure_android_packages(sdkmanager_t
 def suggest_mozconfig(os_name, artifact_mode=False):
     _mozbuild_path, sdk_path, ndk_path = get_paths(os_name)
     if artifact_mode:
         print(MOBILE_ANDROID_ARTIFACT_MODE_MOZCONFIG_TEMPLATE % (sdk_path))
     else:
         print(MOBILE_ANDROID_MOZCONFIG_TEMPLATE % (sdk_path, ndk_path))
 
 
-def android_ndk_url(os_name, ver='r11c'):
+def android_ndk_url(os_name, ver='r15c'):
     # Produce a URL like
     # 'https://dl.google.com/android/repository/android-ndk-$VER-linux-x86_64.zip
     base_url = 'https://dl.google.com/android/repository/android-ndk'
 
     if os_name == 'macosx':
         # |mach bootstrap| uses 'macosx', but Google uses 'darwin'.
         os_name = 'darwin'