Skip to content

Commit

Permalink
CI: Fix Android builds in GitHub Actions.
Browse files Browse the repository at this point in the history
When `$ANDROID_NDK_HOME` is set, `mk/cargo.sh` will use it to locate the
NDK tools. Thus, we need to ensure that the hack is applied to
`$ANDROID_NDK_HOME` when that is set.

I am not sure why I added this line; perhaps it was unintentially left in
when the script was being debugged.
  • Loading branch information
briansmith committed Feb 15, 2023
1 parent 9ee8cf8 commit ffcd828
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion mk/install-build-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ case $target in
|| echo $accept_android_license >> "$android_license_file"
"${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" "ndk;$ndk_version"

ANDROID_NDK_ROOT=
# XXX: Older Rust toolchain versions link with `-lgcc` instead of `-lunwind`;
# see https://github.com/rust-lang/rust/pull/85806.
find -L ${ANDROID_NDK_ROOT:-${ANDROID_HOME}/ndk/$ndk_version} -name libunwind.a \
Expand Down

0 comments on commit ffcd828

Please sign in to comment.