Skip to content

Commit

Permalink
ci: Remove Windows NDK symlink; GH images now include space-less NDK
Browse files Browse the repository at this point in the history
In [1] this hack was introduced because GH Actions virtual-environments
installed the SDK in `Program Files` which includes a space, but this is
not supported by the NDK. Now that the issue has been addressed [2] and
the images deployed this workaround can be removed again.

[1]: rust-mobile#92
[2]: actions/runner-images#2343
  • Loading branch information
MarijnS95 committed Jan 27, 2021
1 parent 556f3ac commit 2f79ed7
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,6 @@ jobs:
run:
cargo install --path cargo-apk

- if: runner.os == 'Windows'
name: Create symlink to Android SDK/NDK without spaces
run: |
$oldAndroidPath = $env:ANDROID_HOME
$sdk_root = "C:\Android"
New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
echo "ANDROID_NDK_ROOT=$sdk_root\ndk-bundle" >> $env:GITHUB_ENV
# Update legacy path for ndk-build:
echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
# Unset legacy paths:
echo "ANDROID_NDK_HOME=" >> $env:GITHUB_ENV
echo "ANDROID_NDK_PATH=" >> $env:GITHUB_ENV
- name: Cargo check for target ${{ matrix.rust-target }}
run: cargo check -p ndk --target ${{ matrix.rust-target }} --all-features

Expand Down

0 comments on commit 2f79ed7

Please sign in to comment.