Repository navigation
Stop the DNS shim and LSFG layer from loading libandroid.so - #2228
Merged
Merged
Conversation
libandroid.so pulls in ~200 system libraries that look up their own dependencies through the guest's LD_LIBRARY_PATH, so they bind to imagefs libraries of the same name and fail to link on Samsung (libsqlite needs BoringSSL's libcrypto) and Xiaomi HyperOS (libjpeg-hyper needs the system libjpeg). DNS shim: res_query() returned ENOSYS for every query when that dlopen failed, and Wine's Android dnsapi, which dlsyms android_res_nquery from its own failed libandroid handle, called a NULL pointer. Call resNetworkQuery and resNetworkResult from libnetd_client.so (what libandroid's wrappers do) and export android_res_nquery/android_res_nresult with libandroid's behaviour so dnsapi finds them through RTLD_DEFAULT. android_getaddrinfofornetwork(0, ...) is the same call as getaddrinfo(), so use that. LSFG layer: drop its unused DT_NEEDED on libandroid.so (it only imports __android_log_print from liblog) and bump the runtime version so containers reinstall it.
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Merge Risk: ⚪ Minimal · up to
|
| Check name | Status | Explanation | Resolution |
|---|---|---|---|
| Docstring Coverage |  |
Docstring coverage is 33.33% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 6 functions across 2 files. | Write docstrings for the functions missing them to satisfy the coverage threshold. |
-
Check name Status Explanation Title check The title clearly and concisely describes the primary change: preventing the DNS shim and LSFG layer from loading libandroid.so. Linked Issues check Check skipped because no linked issues were found for this pull request. Out of Scope Changes check Check skipped because no linked issues were found for this pull request. Description check The pull request includes all required sections, explains the technical changes and rationale, documents testing and limitations, identifies the change type, and addresses the checklist. The recording… Full details: Description check
-
Explanation
The pull request includes all required sections, explains the technical changes and rationale, documents testing and limitations, identifies the change type, and addresses the checklist. The recording is marked N/A because the change has no UI component, and the unchecked recording item is justified.
-
✨ Finishing Touches: 💡 1
-
📝 Generate docstrings: 💡
-
- Commit to this branch
- Create a new PR
🧪 Generate unit tests (beta)
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Comment @coderabbitai help to get the list of available commands.
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Built from GameNative/lsfg-vk-android#9 (release + link nativewindow instead of android) instead of patching the old binary.
utkarshdalal
added a commit
that referenced
this pull request
Oct 23, 2026
The gamescope_system_libs symlinks to /system/lib64/libcrypto.so and libjpeg.so only existed because libgndrm_shim.so linked libandroid.so, whose OEM deps resolved against imagefs's same-named libs. The shim no longer links libandroid (gamenative-drm#9, app #2228), so nothing in a gamescope session loads those system libs. The gamescope LD_LIBRARY_PATH now starts at gamescope/lib.
utkarshdalal
added a commit
to joshuatam/GameNative
that referenced
this pull request
Oct 23, 2026
The gamescope_system_libs symlinks to /system/lib64/libcrypto.so and libjpeg.so only existed because libgndrm_shim.so linked libandroid.so, whose OEM deps resolved against imagefs's same-named libs. The shim no longer links libandroid (gamenative-drm#9, app utkarshdalal#2228), so nothing in a gamescope session loads those system libs. The gamescope LD_LIBRARY_PATH now starts at gamescope/lib.
Merged
5 of 8 tasks
utkarshdalal
added a commit
that referenced
this pull request
Oct 23, 2026
…es (payload 20261023.3) (#2230) * gamescope: hide the boot splash on the first mapped window, as X11 does Under the X11 display server the app hides the "Launching game" splash on the first mapped window and the user sees black until the game's first frame, because the renderers never draw explorer. Under gamescope the splash instead waited for a game-window note from the shim's present path or from gamescope's commit-rate scan, because hiding it earlier showed Wine's blue desktop wallpaper and taskbar, which gamescope composites. That gate kept the splash up for tens of seconds after there was something to show (L.A. Noire loads for 25 s behind it). Both modes now use the same rule. Game sessions get a black desktop background with no wallpaper and explorer's shell (taskbar, start menu, standalone systray) turned off for the "shell" desktop (WineThemeManager.gameSessionTheme and the enableShell flag of apply, applied in setupWineSystemFiles for launches that are not bootToContainer). That is a no-op under X11 and removes the blue and the taskbar under gamescope; "Open container" keeps the user's theme and shell. Payload 20261023.3 ships gamescope A43 reworked to send the game-window note on the first top-level X map, like the X11 rule, with a once-a-second resend (GameNative/gamescope#6), and the shim without its own game-window report (gamenative-drm#12) on top of the device-gated proc lookup (gamenative-drm#11). The bundled libgamenative_drm.so is the daemon from gamenative-drm#12: it clears the splash as soon as the note arrives instead of on the next published frame. * gamescope: drop the system libcrypto/libjpeg links The gamescope_system_libs symlinks to /system/lib64/libcrypto.so and libjpeg.so only existed because libgndrm_shim.so linked libandroid.so, whose OEM deps resolved against imagefs's same-named libs. The shim no longer links libandroid (gamenative-drm#9, app #2228), so nothing in a gamescope session loads those system libs. The gamescope LD_LIBRARY_PATH now starts at gamescope/lib. * Default new containers to gamescope only on Adreno Gamescope is verified on Adreno 735, 750, 830 and 840. Mali-G710 works, but Mali-G68 cannot create gamescope's compute pipelines, and Xclipse and PowerVR are untested, so every non-Adreno GPU now defaults to X11. setContainerDefaults resolves the default from the cached GL renderer string at startup and stores it in DefaultVersion.DISPLAY_SERVER, which the unset display server preference and new ContainerData use. The per-container setting, known and community configs, and an explicitly set global preference still win; existing containers keep their value. --------- Co-authored-by: Utkarsh Dalal <utkarsh.dalal@toptal.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
libandroid.sopulls in ~200 system libraries, and inside a game they look up their own dependencies through ourLD_LIBRARY_PATH, so they bind to imagefs libraries with the same name. On Samsung (libsqlite needs BoringSSL's libcrypto) and Xiaomi HyperOS (libjpeg-hyper needs the system libjpeg) loadinglibandroid.sofails. Gamescope is covered by #2227. This PR fixes the two other libraries we ship that load it into game processes.DNS shim (
app/src/main/cpp/gamenative_dns_v4mapped.c, preloaded into every game)dlopen("libandroid.so")failed,res_query()returned ENOSYS for every query. EA App's DirtySDK networking and the Rockstar launcher go through this path, which may explain the EA/Rockstar reports from these phones.dnsapi(Proton 9 and 11) also dlopenslibandroid.so. It then callsandroid_res_nquerywithout a NULL check, so on these phones the firstDnsQueryjumps to address 0.resNetworkQuery/resNetworkResultfromlibnetd_client.sodirectly. That is all libandroid's wrappers do (checked in the disassembly), and libnetd_client's dependencies share no names with imagefs. The shim also exportsandroid_res_nquery/android_res_nresultwith libandroid's exact behaviour. Bionic'sdlsym(NULL, ...)isRTLD_DEFAULT, so Proton's dnsapi finds ours when its own dlopen fails, with no Proton rebuild.android_getaddrinfofornetwork(0, ...)is the same call bionic'sgetaddrinfomakes, so that now goes straight togetaddrinfo.LSFG layer (
liblsfg-vk-layer.so)NEEDEDonlibandroid.sobut imports nothing from it (its only non-libc import is__android_log_print, from liblog). On these phones the Vulkan loader could not load the layer, so LSFG silently did nothing.nativewindowinstead ofandroid(releaseneeds neither;android-gen8-fixesneedsAHardwareBuffer_*, which libnativewindow exports). Same dynamic exports as the old binary, 16 KB alignment.RUNTIME_VERSIONis bumped so existing containers reinstall the layer.Testing
On a POCO F6 (HyperOS 1, Android 14), with a test binary and the Samsung failure forced by putting a stub
libsqlite.sofirst onLD_LIBRARY_PATH:res_queryAdlsym(NULL, "android_res_nquery")res_queryAdlopendlopenNot yet tested in a real game session.
Recording
N/A, no UI change.
Type of Change
Checklist
#code-changes, I have discussed this change there and it has been green-lighted. If I do not have access, I have still provided clear context in this PR. If I skip both, I accept that this change may face delays in review, may not be reviewed at all, or may be closed.CONTRIBUTING.md.