diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-01-24 15:43:20 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-24 17:18:38 +0000 |
| commit | b4778d370a627b0d33bdca55c32c89ec7f73c765 (patch) | |
| tree | 313b5a906ccc91ece35dacba70a9339ec8f4e285 | |
| parent | 0f9c80c6e680cffacf6e968d83ffd972f84b08ea (diff) | |
Android Cross Compilation - Fix flake8 warnings
Change-Id: Id6e9cdbc7c0b763e8bbb4b7e8dc3ab568b65ebf8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 82aaa6484834b1429d34554512376397d5204e7e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tools/cross_compile_android/android_utilities.py | 6 | ||||
| -rw-r--r-- | tools/cross_compile_android/main.py | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/cross_compile_android/android_utilities.py b/tools/cross_compile_android/android_utilities.py index e93631173..b09ab7bd9 100644 --- a/tools/cross_compile_android/android_utilities.py +++ b/tools/cross_compile_android/android_utilities.py @@ -126,14 +126,14 @@ def download_android_ndk(ndk_path: Path): print(f"NDK path found in {str(ndk_version_path)}") else: ndk_path.mkdir(parents=True, exist_ok=True) - url = f"https://dl.google.com/android/repository/android-ndk-r{ANDROID_NDK_VERSION}-linux.zip" + url = (f"https://dl.google.com/android/repository" + f"/android-ndk-r{ANDROID_NDK_VERSION}-linux.zip") print(f"Downloading Android Ndk version r{ANDROID_NDK_VERSION}") _download(url=url, destination=ndk_zip_path) print("Unpacking Android Ndk") - _unpack(zip_file=(ndk_path / - f"android-ndk-r{ANDROID_NDK_VERSION}-linux.zip"), + _unpack(zip_file=(ndk_path / f"android-ndk-r{ANDROID_NDK_VERSION}-linux.zip"), destination=ndk_path) return ndk_version_path diff --git a/tools/cross_compile_android/main.py b/tools/cross_compile_android/main.py index ba01c499f..85f9bb73b 100644 --- a/tools/cross_compile_android/main.py +++ b/tools/cross_compile_android/main.py @@ -5,11 +5,9 @@ import sys import logging import argparse import tempfile -import subprocess import stat import warnings from dataclasses import dataclass -from typing import List from pathlib import Path from git import Repo, RemoteProgress @@ -17,7 +15,7 @@ from tqdm import tqdm from jinja2 import Environment, FileSystemLoader from android_utilities import (run_command, download_android_commandlinetools, - download_android_ndk, install_android_packages) + download_android_ndk, install_android_packages) # Note: Does not work with PyEnv. Your Host Python should contain openssl. PYTHON_VERSION = "3.10" @@ -164,7 +162,8 @@ if __name__ == "__main__": platform_data = PlatformData("armv7a", f"eabi{api_level}", "armeabi-v7a", "armv7", "armv7", "32") elif plat_name == "aarch64": - platform_data = PlatformData("aarch64", api_level, "arm64-v8a", "arm64_v8a", "armv8-a", "64") + platform_data = PlatformData("aarch64", api_level, "arm64-v8a", "arm64_v8a", "armv8-a", + "64") elif plat_name == "i686": platform_data = PlatformData("i686", api_level, "x86", "x86", "i686", "32") else: # plat_name is x86_64 @@ -212,8 +211,8 @@ if __name__ == "__main__": logging.info(f"Running Python cross-compile for platform {platform_data.plat_name}") run_command(["./cross_compile.sh"], cwd=cpython_dir, dry_run=dry_run, show_stdout=True) - python_path = (f"{android_py_install_path_prefix}/Python-{platform_data.plat_name}-linux-android/" - "_install") + python_path = (f"{android_py_install_path_prefix}" + f"/Python-{platform_data.plat_name}-linux-android/_install") # run patchelf to change the SONAME of libpython from libpython3.x.so.1.0 to # libpython3.x.so, to match with python_for_android's Python library. Otherwise, |