ci: fix Android environment (#2448)

Signed-off-by: JP Simard <[email protected]>
envoyproxy · Aug 1, 2022 · 4cf9236 · 4cf9236
1 parent fe696c5
commit 4cf9236
Showing 1 changed file with 2 additions and 5 deletions.
diff --git 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