Skip to content

Commit

Permalink
remove lynx-r1 loader (no longer needed)
Browse files Browse the repository at this point in the history
  • Loading branch information
korejan committed May 19, 2024
1 parent ef56104 commit e26a715
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 346 deletions.
41 changes: 2 additions & 39 deletions .github/workflows/prepare-alxr-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,6 @@ jobs:
cargo xtask build-alxr-pico-v4 --release
cargo clean
- name: Build & Package alxr-android-lynx-release
run: |
unset ANDROID_HOME
JAVA_HOME=$JAVA_HOME_17_X64
cargo xtask build-alxr-lynx --release
cargo clean
- name: Upload alxr-android-generic-release
uses: actions/upload-release-asset@v1
env:
Expand Down Expand Up @@ -414,16 +407,6 @@ jobs:
asset_path: ./build/release/alxr_client_android/alxr-client-pico-v4.apk
asset_name: alxr-client-pico-v4.apk
asset_content_type: application/vnd.android.package-archive

- name: Upload alxr-android-lynx-release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.prepare_release.outputs.upload_url }}
asset_path: ./build/release/alxr_client_android/alxr-client-lynx.apk
asset_name: alxr-client-lynx.apk
asset_content_type: application/vnd.android.package-archive

build_alxr_android_debug:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -498,17 +481,7 @@ jobs:
mv alxr-client-pico-v4.apk alxr-client-pico-v4-debug.apk
popd
cargo clean
- name: Build & Package alxr-android-lynx-debug
run: |
unset ANDROID_HOME
JAVA_HOME=$JAVA_HOME_17_X64
cargo xtask build-alxr-lynx
pushd ./build/debug/alxr_client_android
mv alxr-clientlynx.apk alxr-client-lynx-debug.apk
popd
cargo clean
- name: Upload alxr-android-generic-debug
uses: actions/upload-release-asset@v1
env:
Expand Down Expand Up @@ -548,17 +521,7 @@ jobs:
asset_path: ./build/debug/alxr_client_android/alxr-client-pico-v4-debug.apk
asset_name: alxr-client-pico-v4-debug.apk
asset_content_type: application/vnd.android.package-archive

- name: Upload alxr-android-lynx-debug
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.prepare_release.outputs.upload_url }}
asset_path: ./build/debug/alxr_client_android/alxr-client-lynx-debug.apk
asset_name: alxr-client-lynx-debug.apk
asset_content_type: application/vnd.android.package-archive


build_libalxr_win_x64_release:
runs-on: windows-2022
needs: [prepare_release]
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ members = [
"alvr/openxr-client/alxr-android-client/quest",
"alvr/openxr-client/alxr-android-client/pico",
"alvr/openxr-client/alxr-android-client/pico-v4",
"alvr/openxr-client/alxr-android-client/lynx",
"alvr/xtask",
]
8 changes: 7 additions & 1 deletion alvr/openxr-client/alxr-android-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ min_sdk_version = 28#24 # for offical low-latency medicodec mode to be enabled,
# Note: there can be multiple .uses_feature entries.
[[package.metadata.android.uses_feature]]
name = "android.hardware.vr.headtracking"
required = false
required = true
version = 1

[[package.metadata.android.uses_feature]]
Expand Down Expand Up @@ -269,6 +269,12 @@ name = "android.permission.WAKE_LOCK"
[[package.metadata.android.uses_permission]]
name = "android.permission.READ_EXTERNAL_STORAGE"

[[package.metadata.android.uses_permission]]
name = "android.permission.WRITE_EXTERNAL_STORAGE"

[[package.metadata.android.uses_permission]]
name = "android.permission.MANAGE_EXTERNAL_STORAGE"

[[package.metadata.android.uses_permission]]
name = "android.permission.VIBRATE"

Expand Down
272 changes: 0 additions & 272 deletions alvr/openxr-client/alxr-android-client/lynx/Cargo.toml

This file was deleted.

Binary file not shown.
Loading

0 comments on commit e26a715

Please sign in to comment.