Install Android NDK r25b (bazelbuild#1434)

* Install Android NDK r25b * Mount android ndk r25b to docker container
fmeum · Dec 10, 2023 · a76467b · a76467b
1 parent 8fb36d3
commit a76467b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh
@@ -166,9 +166,12 @@ EOF
 ### Install Android NDK.
 {
   cd /opt
-  curl -fsSL -o android-ndk.zip https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
-  unzip android-ndk.zip > /dev/null
-  rm android-ndk.zip
+  curl -fsSL -o android-ndk-r15c.zip https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
+  unzip android-ndk-r15c.zip > /dev/null
+  rm android-ndk-r15c.zip
+  curl -fsSL -o android-ndk-r25b.zip https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
+  unzip android-ndk-r25b.zip > /dev/null
+  rm android-ndk-r25b.zip
 }
 
 ### Install Android SDK.

diff --git a/buildkite/terraform/bazel-testing/pipeline.yml.tpl b/buildkite/terraform/bazel-testing/pipeline.yml.tpl
@@ -30,6 +30,7 @@ steps:
             - "/etc/passwd:/etc/passwd:ro"
             - "/etc/shadow:/etc/shadow:ro"
             - "/opt/android-ndk-r15c:/opt/android-ndk-r15c:ro"
+            - "/opt/android-ndk-r25b:/opt/android-ndk-r25b:ro"
             - "/opt/android-sdk-linux:/opt/android-sdk-linux:ro"
             - "/var/lib/buildkite-agent:/var/lib/buildkite-agent"
             - "/var/lib/gitmirrors:/var/lib/gitmirrors:ro"

diff --git a/buildkite/terraform/bazel-trusted/pipeline.yml.tpl b/buildkite/terraform/bazel-trusted/pipeline.yml.tpl
@@ -34,6 +34,7 @@ steps:
             - "/etc/passwd:/etc/passwd:ro"
             - "/etc/shadow:/etc/shadow:ro"
             - "/opt/android-ndk-r15c:/opt/android-ndk-r15c:ro"
+            - "/opt/android-ndk-r25b:/opt/android-ndk-r25b:ro"
             - "/opt/android-sdk-linux:/opt/android-sdk-linux:ro"
             - "/var/lib/buildkite-agent:/var/lib/buildkite-agent"
             - "/var/lib/gitmirrors:/var/lib/gitmirrors:ro"

diff --git a/buildkite/terraform/bazel/pipeline.yml.tpl b/buildkite/terraform/bazel/pipeline.yml.tpl
@@ -30,6 +30,7 @@ steps:
             - "/etc/passwd:/etc/passwd:ro"
             - "/etc/shadow:/etc/shadow:ro"
             - "/opt/android-ndk-r15c:/opt/android-ndk-r15c:ro"
+            - "/opt/android-ndk-r25b:/opt/android-ndk-r25b:ro"
             - "/opt/android-sdk-linux:/opt/android-sdk-linux:ro"
             - "/var/lib/buildkite-agent:/var/lib/buildkite-agent"
             - "/var/lib/gitmirrors:/var/lib/gitmirrors:ro"