From 45a822afa5b63aeee35ac1cfcb4e3c70043ef945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Tue, 2 Feb 2021 23:52:13 +0100 Subject: [PATCH] Fix setup.py download logic on Android --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9babea4..bb652e3 100755 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ from setuptools.command.build_ext import build_ext from setuptools.extension import Extension import shutil import struct +import subprocess import sys try: from urllib.request import urlopen, Request @@ -82,11 +83,13 @@ class FridaPrebuiltExt(build_ext): else: os_version = "macosx-11.0-arm64" elif system == 'Linux': + os_name = 'android' if subprocess.check_output(["uname", "-o"]).decode('utf-8').rstrip() == 'Android' else 'linux' machine = platform.machine() if machine == "" or "86" in machine: - os_version = "linux-x86_64" if arch == 64 else "linux-i686" + arch_name = "x86_64" if arch == 64 else "i686" else: - os_version = "linux-" + machine + arch_name = machine + os_version = "{}-{}".format(os_name, arch_name) else: raise NotImplementedError("unsupported OS")