diff options
| author | Samson <16504129+sagudev@users.noreply.github.com> | 2024-07-29 09:20:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 07:20:15 +0000 |
| commit | d132a0273d17a140a916bb4c73cdb1d81fee1d2d (patch) | |
| tree | ff8e2dd72e0d91d6891e7e4a4147d8f111091d08 /python/servo | |
| parent | ed8def28960fd64fa0d00bd67731d594c1042747 (diff) | |
| download | servo-d132a0273d17a140a916bb4c73cdb1d81fee1d2d.tar.gz servo-d132a0273d17a140a916bb4c73cdb1d81fee1d2d.zip | |
Update mozjs (SpiderMonkey) to 128.0 (#32769)
* Update mozjs
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Fix changed readTransfer callback
https://bugzilla.mozilla.org/show_bug.cgi?id=1842713
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Use NewExternalArrayBuffer from glue
https://github.com/servo/mozjs/pull/474/commits/d33454be74ec5b8d8faf51fab3ed477b8913898b
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Fix columnorigin and filename being in latin1
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* fixup newexternalarray
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Float16 (this might require more work for codegen support)
https://bugzilla.mozilla.org/show_bug.cgi?id=1833647
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* js.strict is removed
https://bugzilla.mozilla.org/show_bug.cgi?id=1621603
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* asm options are now somewhere else
https://hg.mozilla.org/mozilla-central/rev/26045c88e3972957087d535e7f259e08857bd2a2
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Comment out offthread compilation
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Set NDK to 26
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Fix 1-origin handling
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Expect `FinalizationRegistry` interface
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Good expectations
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* more expectations
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Add `WeakRef` to interfaces expectation
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* mozjs upgrade: fixes for Android
Android NDK's layout has changed in r26 and 'lib64' no longer exists
under `toolchain/llvm/prebuilt/linux-x86_64`. The libraries that used to
be it are now present in `lib` folder itself.
This patch updates the build configuration to use the `lib` folder
instead when configuring the LIBCLANG_PATH environment variable.
This patch also updates to a newer mozjs version that includes fixes for
linker errors faced on Android (see #32769).
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Patch libz-sys & update mozjs
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* update NDK version in README
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Use servo/mozjs
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Update mozjs again
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
---------
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d8adb293aa9..4b5de868531 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -569,15 +569,15 @@ class CommandBase(object): android_api = android_platform.replace('android-', '') - # Check if the NDK version is 25 + # Check if the NDK version is 26 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] != '25': - print("Servo currently only supports NDK r25c.") + if lines[1].split(' = ')[1].split('.')[0] != '26': + print("Servo currently only supports NDK r26c.") sys.exit(1) # Android builds also require having the gcc bits on the PATH and various INCLUDE @@ -633,7 +633,7 @@ class CommandBase(object): env['TARGET_STRIP'] = to_ndk_bin("llvm-strip") env['RUST_FONTCONFIG_DLOPEN'] = "on" - env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib64") + env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib") env["CLANG_PATH"] = to_ndk_bin("clang") # A cheat-sheet for some of the build errors caused by getting the search path wrong... |