Skip to content

feat(bionic): remove libredirect on legacy and update libredirect on modern variant to improve performance #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joshuatam wants to merge 3 commits into from
Closed

feat(bionic): remove libredirect on legacy and update libredirect on modern variant to improve performance #1834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00ed639
feat: remove libredirect on legacy and update libredirect on modern v…
joshuatam Aug 19, 2026
6f47b5c
just check MODERN_ANDROID is enough
joshuatam Aug 19, 2026
64568aa
also make sure ImageFsInstaller to replace the library when it is upd…
joshuatam Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions app/src/main/java/com/winlator/xenvironment/components/BionicProgramLauncherComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,15 @@ private int execGuestProgram() {

String ld_preload = "";
String sysvPath = imageFs.getLibDir() + "/libandroid-sysvshm.so";
String evshimPath = context.getApplicationInfo().nativeLibraryDir + "/libevshim.so";
String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;

if (new File(sysvPath).exists()) ld_preload += sysvPath;


String evshimPath = context.getApplicationInfo().nativeLibraryDir + "/libevshim.so";
ld_preload += ":" + evshimPath;
ld_preload += ":" + replacePath;

if (BuildConfig.MODERN_ANDROID || BuildConfig.MODERN_XR) {
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;
ld_preload += ":" + replacePath;
}

envVars.put("LD_PRELOAD", ld_preload);
envVars.put("EVSHIM_WINE", 1);
Expand Down Expand Up @@ -671,12 +672,14 @@ public String execShellCommand(String command, boolean includeStderr) {
envVars.put("SteamGameId", "0");

String ld_preload = "";
String sysvPath = imageFs.getLibDir() + "/libandroid-sysvshm.so";
String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;

String sysvPath = imageFs.getLibDir() + "/libandroid-sysvshm.so";
if (new File(sysvPath).exists()) ld_preload += sysvPath;

ld_preload += ":" + replacePath;
if (BuildConfig.MODERN_ANDROID || BuildConfig.MODERN_XR) {
String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;
ld_preload += ":" + replacePath;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

envVars.put("LD_PRELOAD", ld_preload);

Expand Down
Binary file modified app/src/modern/assets/libredirect-bionic-wx.so
View file
Open in desktop
Binary file not shown.
Loading