Skip to content

Update ALVR to latest #410

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

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Update ALVR to latest #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d74452
build(deps): bump code/mobile/android/PhoneVR/ALVR
dependabot[bot] Dec 3, 2024
6cf436b
Update ALVR to latest master
ShootingKing-AM Dec 9, 2024
e5d03a7
fix: gradle using cached jni_libs even when new libs are available
ShootingKing-AM Dec 9, 2024
968df01
init update
ShootingKing-AM Dec 9, 2024
5627e7a
fix lint
ShootingKing-AM Dec 9, 2024
2ad8735
wip
ShootingKing-AM Dec 10, 2024
5113523
try using alvr-org/PR 2567
ShootingKing-AM Dec 11, 2024
7215104
Update gradle
ShootingKing-AM Dec 11, 2024
2a2ecf5
wip 2
ShootingKing-AM Dec 11, 2024
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
2 changes: 1 addition & 1 deletion code/mobile/android/PhoneVR/ALVR
Open in desktop
Submodule ALVR updated 866 files
11 changes: 9 additions & 2 deletions code/mobile/android/PhoneVR/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,21 @@ task deleteNdk(type: Delete) {
delete "../ALVR/target/"
}

task deleteGradleJniCache(type: Delete)
{
// delete merged_jni_libs
delete "build/intermediates/merged_jni_libs"
}

task buildClientLib {
dependsOn deleteGradleJniCache
doLast {
exec {
workingDir '../ALVR'
if(defaultALVRFlavour.length() > 0)
commandLine 'cargo', 'xtask', 'build-client-lib', '--no-stdcpp', defaultALVRFlavour
commandLine 'cargo', 'xtask', 'build-client-lib', '--all-targets', '--no-stdcpp', defaultALVRFlavour
else
commandLine 'cargo', 'xtask', 'build-client-lib', '--no-stdcpp'
commandLine 'cargo', 'xtask', 'build-client-lib', '--all-targets', '--no-stdcpp'
}
}
}
Expand Down
1 change: 1 addition & 0 deletions code/mobile/android/PhoneVR/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />

<uses-feature
android:glEsVersion="0x00030001"
Expand Down
Loading
Loading