androidenv: emulator: support 35.5.x

This commit is contained in:
Morgan Jones
2025-03-29 22:13:03 +05:30
committed by Masum Reza
parent 63ebb67f9c
commit f81ada79e3
@@ -36,6 +36,8 @@ deployAndroidPackage {
nss
nspr
alsa-lib
llvmPackages_15.libllvm.lib
waylandpp.lib
]
)
++ (with pkgs.xorg; [
@@ -52,6 +54,7 @@ deployAndroidPackage {
libICE
libSM
libxkbfile
libxshmfence
])
++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
patchInstructions = lib.optionalString (os == "linux") ''
@@ -66,6 +69,10 @@ deployAndroidPackage {
patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
done
for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
done
autoPatchelf $out
# Wrap emulator so that it can load required libraries at runtime