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 under that pass are not 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 servo#32769). Signed-off-by: Mukilan Thiyagarajan <[email protected]>
mukilan · Jul 26, 2024 · d4727c1 · d4727c1
1 parent 58bd231
commit d4727c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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