Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1797227 - Avoid dependency on wget in bootstrap. r=firefox-build-system-reviewers,nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D160174
This commit is contained in:
Mike Hommey 2022-10-25 22:54:41 +00:00
parent c45abc29af
commit 6fc75fe829
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,19 +104,6 @@ class GetNdkVersionError(Exception):
pass
def install_bundletool(url, path: Path):
"""
Fetch bundletool to the desired directory.
"""
try:
subprocess.check_call(
["wget", "--continue", url, "--output-document", "bundletool.jar"],
cwd=str(path),
)
finally:
pass
def install_mobile_android_sdk_or_ndk(url, path: Path):
"""
Fetch an Android SDK or NDK from |url| and unpack it into the given |path|.
@ -141,30 +128,7 @@ def install_mobile_android_sdk_or_ndk(url, path: Path):
file_name = url.split("/")[-1]
download_file_path = download_path / file_name
with requests.Session() as session:
request = session.head(url)
remote_file_size = int(request.headers["content-length"])
if download_file_path.is_file():
local_file_size = download_file_path.stat().st_size
if local_file_size == remote_file_size:
print(f"{download_file_path} already downloaded. Skipping download...")
else:
print(
f"Partial download detected. Resuming download of {download_file_path}..."
)
download(
download_file_path,
session,
url,
remote_file_size,
local_file_size,
)
else:
print(f"Downloading {download_file_path}...")
download(download_file_path, session, url, remote_file_size)
download(url, download_file_path)
if file_name.endswith(".tar.gz") or file_name.endswith(".tgz"):
cmd = ["tar", "zxf", str(download_file_path)]
@ -194,6 +158,35 @@ def install_mobile_android_sdk_or_ndk(url, path: Path):
def download(
url,
download_file_path: Path,
):
with requests.Session() as session:
request = session.head(url)
remote_file_size = int(request.headers["content-length"])
if download_file_path.is_file():
local_file_size = download_file_path.stat().st_size
if local_file_size == remote_file_size:
print(f"{download_file_path} already downloaded. Skipping download...")
else:
print(
f"Partial download detected. Resuming download of {download_file_path}..."
)
download_internal(
download_file_path,
session,
url,
remote_file_size,
local_file_size,
)
else:
print(f"Downloading {download_file_path}...")
download_internal(download_file_path, session, url, remote_file_size)
def download_internal(
download_file_path: Path,
session,
url,
@ -463,7 +456,7 @@ def ensure_android_sdk_and_ndk(
(cmdline_tools_path / "cmdline-tools").rename(
cmdline_tools_path / CMDLINE_TOOLS_VERSION_STRING
)
install_bundletool(bundletool_url, mozbuild_path)
download(bundletool_url, mozbuild_path / "bundletool.jar")
def get_packages_to_install(packages_file_content, avd_manifest):