Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 13:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: add support for x86_64 images (#31725)

Browse source 
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2024-03-18 15:14:10 +05:30 • committed by GitHub
parent b2f2ae61db
commit 4bca55e27a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
python/servo/command_base.py
View file

@ -588,6 +588,19 @@ class CommandBase(object):
def to_ndk_bin(prog):
return path.join(llvm_toolchain, "bin", prog)
# This workaround is due to an issue in the x86_64 Android NDK that introduces
# an undefined reference to the symbol '__extendsftf2'.
# See https://github.com/termux/termux-packages/issues/8029#issuecomment-1369150244
if "x86_64" in self.cross_compile_target:
libclangrt_filename = subprocess.run(
[to_ndk_bin(f"x86_64-linux-android{android_api}-clang"), "--print-libgcc-file-name"],
check=True,
capture_output=True,
encoding="utf8"
).stdout
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "")
env["RUSTFLAGS"] += f"-C link-arg={libclangrt_filename}"
env["RUST_TARGET"] = self.cross_compile_target
env['HOST_CC'] = host_cc
env['HOST_CXX'] = host_cxx
@ -912,6 +925,14 @@ class CommandBase(object):
self.config["android"]["lib"] = "x86"
self.config["android"]["toolchain_name"] = "i686-linux-android30"
return True
elif target == "x86_64-linux-android":
self.config["android"]["platform"] = "android-30"
self.config["android"]["target"] = target
self.config["android"]["toolchain_prefix"] = target
self.config["android"]["arch"] = "x86_64"
self.config["android"]["lib"] = "x86_64"
self.config["android"]["toolchain_name"] = "x86_64-linux-android30"
return True
return False
def ensure_bootstrapped(self):

2
python/servo/package_commands.py
View file

@ -146,6 +146,8 @@ class PackageCommands(CommandBase):
arch_string = "Armv7"
elif "i686" in android_target:
arch_string = "x86"
elif "x86_64" in android_target:
arch_string = "x64"
else:
arch_string = "Arm"