Update skqp's Android NDK to r20
Change-Id: Id479e8c29cff650de17ea2f58d1c3811b2dbac86
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225544
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86-devrel-Android_SKQP.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86-devrel-Android_SKQP.json
index c7bbb50..7c73195 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86-devrel-Android_SKQP.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86-devrel-Android_SKQP.json
@@ -25,7 +25,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/skqp:/OUT",
- "gcr.io/skia-public/android-skqp:8.1_v3",
+ "gcr.io/skia-public/android-skqp:r20_v1",
"./build_apk.sh"
],
"env": {
diff --git a/infra/bots/recipe_modules/build/skqp.py b/infra/bots/recipe_modules/build/skqp.py
index c8ea896..d812922 100644
--- a/infra/bots/recipe_modules/build/skqp.py
+++ b/infra/bots/recipe_modules/build/skqp.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-DOCKER_IMAGE = 'gcr.io/skia-public/android-skqp:8.1_v3'
+DOCKER_IMAGE = 'gcr.io/skia-public/android-skqp:r20_v1'
INNER_BUILD_DIR = '/SRC/skia/infra/skqp'
INNER_BUILD_SCRIPT = './build_apk.sh'
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
index 4e2e9fa..4b1b256 100644
--- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
+++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
@@ -134,7 +134,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/skqp:/OUT",
- "gcr.io/skia-public/android-skqp:8.1_v3",
+ "gcr.io/skia-public/android-skqp:r20_v1",
"./build_apk.sh"
],
"env": {
diff --git a/infra/skqp/docker/android-skqp/Dockerfile b/infra/skqp/docker/android-skqp/Dockerfile
index 962c828..fca8db3 100644
--- a/infra/skqp/docker/android-skqp/Dockerfile
+++ b/infra/skqp/docker/android-skqp/Dockerfile
@@ -21,9 +21,9 @@
WORKDIR /root
-RUN wget -O /root/android-ndk-r18-linux-x86_64.zip https://storage.googleapis.com/skia-cdn/android-sdk/android-ndk-r18-linux-x86_64.zip && \
- unzip /root/android-ndk-r18-linux-x86_64.zip && \
- rm -f /root/android-ndk-r18-linux-x86_64.zip
+RUN wget -O /root/android-ndk-r20-linux-x86_64.zip https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip && \
+ unzip /root/android-ndk-r20-linux-x86_64.zip && \
+ rm -f /root/android-ndk-r20-linux-x86_64.zip
# "yes" agrees to the license. (You might think it's waiting for input, but it's not.)
RUN yes | sdkmanager ndk-bundle "lldb;3.1" "cmake;3.6.4111459"
@@ -37,4 +37,4 @@
ENV PATH=$PATH:/opt/depot_tools
-ENV ANDROID_NDK=/root/android-ndk-r18
+ENV ANDROID_NDK=/root/android-ndk-r20
