From 4cf9236a0e1ce23d48d6202bbfc25820d88d7f03 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Mon, 1 Aug 2022 13:57:13 -0400 Subject: [PATCH] ci: fix Android environment (#2448) Signed-off-by: JP Simard --- ci/mac_ci_setup.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index 220107e4e6..62bfef632f 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -50,16 +50,13 @@ sudo xcode-select --switch /Applications/Xcode_13.4.app if [[ "${1:-}" == "--android" ]]; then # Download and set up ndk 21 after GitHub update # https://github.com/actions/virtual-environments/issues/5595 - ANDROID_ROOT="/Users/runner/Library/Android" - ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk" ANDROID_HOME=$ANDROID_SDK_ROOT SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" $SDKMANAGER --uninstall "ndk-bundle" echo "y" | $SDKMANAGER "ndk;21.4.7075529" - export ANDROID_NDK="${ANDROID_SDK_ROOT}/ndk-bundle" - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK + ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 "${ANDROID_SDK_ROOT}/ndk-bundle" # Download and set up build-tools 30.0.3, 31.0.0 is missing dx.jar. $SDKMANAGER --install "build-tools;30.0.3" - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529 + echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529" >> $GITHUB_ENV fi