diff --git a/Cargo.lock b/Cargo.lock index dac907095b403..059aa89b01eb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1385,7 +1385,7 @@ dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.72", ] [[package]] @@ -1409,7 +1409,7 @@ dependencies = [ "serde", "smallvec", "strck_ident", - "syn 2.0.70", + "syn 2.0.72", ] [[package]] @@ -4337,7 +4337,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/sagudev/mozjs?branch=esr128#e618981f24a5105321301b33ab874632661846ed" +source = "git+https://github.com/sagudev/mozjs?branch=esr128#15db7f6d2b4b3a7cbf7ba1a434cbb368ec409f54" dependencies = [ "bindgen", "cc", @@ -4351,7 +4351,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.128.0-0" -source = "git+https://github.com/sagudev/mozjs?branch=esr128#e618981f24a5105321301b33ab874632661846ed" +source = "git+https://github.com/sagudev/mozjs?branch=esr128#15db7f6d2b4b3a7cbf7ba1a434cbb368ec409f54" dependencies = [ "bindgen", "cc", diff --git a/etc/shell.nix b/etc/shell.nix index 922844abfa93f..61b5d680df3a4 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -45,7 +45,7 @@ let systemImageTypes = [ "google_apis" ]; abiVersions = [ "x86" "armeabi-v7a" ]; includeNDK = true; - ndkVersion = "25.2.9519653"; + ndkVersion = "26.2.11394342"; useGoogleAPIs = false; useGoogleTVAddOns = false; includeExtras = [ @@ -158,7 +158,7 @@ stdenv.mkDerivation (androidEnvironment // { # Provide libraries that aren’t linked against but somehow required LD_LIBRARY_PATH = lib.makeLibraryPath [ # Fixes missing library errors - zlib xorg.libXcursor xorg.libXrandr xorg.libXi libxkbcommon + xorg.libXcursor xorg.libXrandr xorg.libXi libxkbcommon # [WARN script::dom::gpu] Could not get GPUAdapter ("NotFound") # TLA Err: Error: Couldn't request WebGPU adapter. diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 33ebbd2aa1cbe..104683c0d064c 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -633,7 +633,7 @@ def to_ndk_bin(prog): 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... diff --git a/support/android/apk/jni/Application.mk b/support/android/apk/jni/Application.mk index 2a6cbd50ea79e..197d8f62e5ee5 100644 --- a/support/android/apk/jni/Application.mk +++ b/support/android/apk/jni/Application.mk @@ -1,5 +1,5 @@ NDK_TOOLCHAIN_VERSION := clang -APP_MODULES := c++_shared servojni +APP_MODULES := servojni APP_PLATFORM := android-30 APP_STL := c++_shared APP_ABI := armeabi-v7a x86 x86_64