Skip to content

Bug 1973898 - Do not overwrite NDK related variables #6813

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

Merged
mhammond merged 1 commit into from
Jun 26, 2025
Merged

Bug 1973898 - Do not overwrite NDK related variables #6813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions libs/android_defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
#!/usr/bin/env bash

# Find the NDK.
pushd ..
NDK_VERSION=$(./gradlew -q printNdkVersion | tail -1)
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
popd || exit

if [[ -z "${ANDROID_NDK_HOME:-}" || -z "${ANDROID_NDK_ROOT:-}" ]]; then
pushd ..
NDK_VERSION=$(./gradlew -q printNdkVersion | tail -1)
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
popd || exit
else
echo "Using ANDROID_NDK_HOME=${ANDROID_NDK_HOME} and ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}"
fi

if [[ -z "${ANDROID_NDK_API_VERSION:-}" ]]; then
export ANDROID_NDK_API_VERSION=21
Expand Down