Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1460355 - Fix: Change how the packages are sent to the sdkmanager to install, avoid missing argument. r=nalexander

Browse Source 
The argument --package_file was removed in the latest sdkmanager by Google's Android. But the docs for it say
packages can also be sent by putting them in quotes and calling the sdk manager with them as individual args.
So now instead of sending the file directly with the --package_file argument, the package names are read from
the file and the sdk manager is called with them as individual args.
Historically this has been thought of as a bug that happens with the wrong version of the JDK, but this can be
reproduced with just java 1.8.0_181 and the most up to date version of sdkmanager currently 26.1.1
Important note, the mach bootstrap command downloads an older version of the sdk and this bug is not present in
the older version.
Since the way of updating packages I'm proposiing to use is backwards compatible, there shouldn't be any problem
in any version of the sdkamanger.
This is a simpler fix than trying the --package_file argument, particularly because it would involve capturing
output (to detect this particular bug) that's also supposed to be shown to the user because this also happens
when the user is supposed to be interacting with the install.

MozReview-Commit-ID: L7VhCVKJNIf
***
Formatting changes to satisfy the linter.

--HG--
extra : rebase_source : f67d2cb85a4136eb8ad5c3053f5436a8870ab528
This commit is contained in:
Aniket Kadam 2018-07-24 20:06:21 +05:30
parent 6a6ca1a08c
commit 3cad808ba6
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
python/mozboot/mozboot/android.py
View File

@ -227,7 +227,27 @@ def ensure_android_sdk_and_ndk(mozbuild_path, os_name, sdk_path, sdk_url, ndk_pa
# preserve the old convention to smooth detecting existing SDK
# installations.
install_mobile_android_sdk_or_ndk(sdk_url, os.path.join(mozbuild_path,
'android-sdk-{0}'.format(os_name)))
'android-sdk-{0}'.format(os_name)))
def get_packages_to_install(packages_file_name):
"""
sdkmanager version 26.1.1 (current) and some versions below have a bug that makes
the following command fail:
args = [sdkmanager_tool, '--package_file={0}'.format(package_file_name)]
subprocess.check_call(args)
The error is in the sdkmanager, where the --package_file param isn't recognized.
The error is being tracked here https://issuetracker.google.com/issues/66465833
Meanwhile, this workaround achives installing all required Android packages by reading
them out of the same file that --package_file would have used, and passing them as strings.
So from here: https://developer.android.com/studio/command-line/sdkmanager
Instead of:
sdkmanager --package_file=package_file [options]
We're doing:
sdkmanager "platform-tools" "platforms;android-26"
"""
with open(packages_file_name) as package_file:
return map(lambda package: package.strip(), package_file.readlines())
def ensure_android_packages(sdkmanager_tool, packages=None, no_interactive=False):
@ -239,10 +259,12 @@ def ensure_android_packages(sdkmanager_tool, packages=None, no_interactive=False
# This tries to install all the required Android packages. The user
# may be prompted to agree to the Android license.
package_file_name = os.path.abspath(os.path.join(os.path.dirname(__file__),
'android-packages.txt'))
'android-packages.txt'))
print(INSTALLING_ANDROID_PACKAGES % open(package_file_name, 'rt').read())
args = [sdkmanager_tool, '--package_file={0}'.format(package_file_name)]
args = [sdkmanager_tool]
args.extend(get_packages_to_install(package_file_name))
if not no_interactive:
subprocess.check_call(args)
return