ci: update Android setup

To account for recent changes to defaults: actions/runner-images#5595 Signed-off-by: JP Simard <[email protected]>
envoyproxy · Jun 9, 2022 · 516b2ba · 516b2ba
1 parent c6d3dd9
commit 516b2ba
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh
@@ -48,16 +48,18 @@ pip3 install slackclient
 sudo xcode-select --switch /Applications/Xcode_13.2.1.app
 
 if [[ "${1:-}" == "--android" ]]; then
-  # Download and set up ndk 21. Github upgraded to ndk 22 for their Mac image.
+  # 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="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
   $SDKMANAGER --uninstall "ndk-bundle"
-  $SDKMANAGER --install "ndk;21.3.6528147"
+  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
 
   # Download and set up build-tools 30.0.3, 31.0.0 is missing dx.jar.
-  $SDKMANAGER --uninstall "build-tools;31.0.0"
   $SDKMANAGER --install "build-tools;30.0.3"
-
-  export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.3.6528147
+  export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529
 fi