From 8367de01bf3e1a55407c1dbf15a061f2cdfc3017 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Tue, 13 Sep 2022 10:24:53 +0200 Subject: [PATCH 1/2] Install Android NDK r25b --- buildkite/setup-docker.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh index 8b7587c519..b98917c6e4 100755 --- 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. From 649a7802930059e42f475b79a7d86cc82cff9b3a Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Tue, 13 Sep 2022 10:29:49 +0200 Subject: [PATCH 2/2] Mount android ndk r25b to docker container --- buildkite/terraform/bazel-testing/pipeline.yml.tpl | 1 + buildkite/terraform/bazel-trusted/pipeline.yml.tpl | 1 + buildkite/terraform/bazel/pipeline.yml.tpl | 1 + 3 files changed, 3 insertions(+) diff --git a/buildkite/terraform/bazel-testing/pipeline.yml.tpl b/buildkite/terraform/bazel-testing/pipeline.yml.tpl index 6ec14d60d0..86b4eda748 100644 --- 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 index 1538c451d9..32bf51a6bc 100644 --- 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 index 6ec14d60d0..86b4eda748 100644 --- 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"