Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-19 11:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to SpiderMonkey 137. (#37077)

Browse source 
Incorporates the updates from https://github.com/servo/mozjs/pull/584.

Testing: Existing WPT coverage is enough.
Fixes: Part of #36258

---------

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2025-08-07 12:47:27 -04:00 • committed by GitHub
parent fd20a5df42
commit 842dd99698
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 129 additions and 1417 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/platform/build_target.py
View file

@ -155,15 +155,15 @@ class AndroidTarget(CrossBuildTarget):
android_api = android_platform.replace("android-", "")
# Check if the NDK version is 26
# Check if the NDK version is 28
if not os.path.isfile(path.join(env["ANDROID_NDK_ROOT"], "source.properties")):
print("ANDROID_NDK should have file `source.properties`.")
print("The environment variable ANDROID_NDK_ROOT may be set at a wrong path.")
sys.exit(1)
with open(path.join(env["ANDROID_NDK_ROOT"], "source.properties"), encoding="utf8") as ndk_properties:
lines = ndk_properties.readlines()
if lines[1].split(" = ")[1].split(".")[0] != "26":
print("Servo currently only supports NDK r26c.")
if lines[1].split(" = ")[1].split(".")[0] != "28":
print("Servo currently only supports NDK r28.")
sys.exit(1)
# Android builds also require having the gcc bits on the PATH and various INCLUDE
@ -239,6 +239,9 @@ class AndroidTarget(CrossBuildTarget):
env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib")
env["CLANG_PATH"] = to_ndk_bin("clang")
env["BINDGEN_EXTRA_CLANG_ARGS"] = (
f"--target={android_toolchain_name} --sysroot={path.join(llvm_toolchain, 'sysroot')}"
)
# A cheat-sheet for some of the build errors caused by getting the search path wrong...
#