mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
Conflicts resolved keeping both sides: main's comment cleanup (#764) taken where only comments differed; the test branch's code kept everywhere else. ensureAuto runs main's Quest auto drivers before the Mali paths; vkp_update_map keeps the Quest layer path and the completion-unknown check (pass_begin goes through it); gamescope backend selection plus main's steam-mode cursor composite; droiddeck-session's watcher is main's shared loop with the Venus GL probe after it; SessionFiles/runtime_inputs/build.yml carry both the Xclipse layer and main's VR assets. Main's GPU detection test follows the non-Adreno support text; the Steam presentation test finds its block by code, not by a removed comment.
37 lines
653 B
Plaintext
37 lines
653 B
Plaintext
*.iml
|
|
.gradle/
|
|
local.properties
|
|
.idea/
|
|
.DS_Store
|
|
build/
|
|
captures/
|
|
.externalNativeBuild/
|
|
.cxx/
|
|
.kotlin/
|
|
app/src/main/assets/linuxfs/
|
|
app/src/main/jniLibs/arm64-v8a/libproot.so
|
|
app/src/main/jniLibs/arm64-v8a/.proot-inputs
|
|
app/src/main/jniLibs/arm64-v8a/.proot-outputs
|
|
app/src/main/jniLibs/arm64-v8a/libproot-loader.so
|
|
app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so
|
|
app/src/main/rust/stores/target/
|
|
app/src/main/assets/droiddeck-esync/
|
|
|
|
.kotlin/
|
|
|
|
*.jks
|
|
*.keystore
|
|
*.p12
|
|
*.pfx
|
|
*.pk8
|
|
*.pem
|
|
!keystore/testkey.p12
|
|
droiddeck-release-key/
|
|
password.txt
|
|
__pycache__/
|
|
|
|
.signing.env
|
|
app/src/main/assets/directaudio/
|
|
app/src/main/assets/hybris/
|
|
/tools/vr/out/
|