AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update skqp's Android NDK to r20

Browse Source 
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>
This commit is contained in:
Kevin Lubick 2019-07-03 15:44:09 -04:00 committed by Skia Commit-Bot
parent 8010c17dc1
commit 11eb847a20
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86-devrel-Android_SKQP.json
View File

@ -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": {

2
infra/bots/recipe_modules/build/skqp.py
View File

@ -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'

2
infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
View File

@ -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": {

8
infra/skqp/docker/android-skqp/Dockerfile
View File

@ -21,9 +21,9 @@ RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /
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 CC="/usr/lib/llvm-6.0/bin/clang" \
ENV PATH=$PATH:/opt/depot_tools
ENV ANDROID_NDK=/root/android-ndk-r18
ENV ANDROID_NDK=/root/android-ndk-r20