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

[sk] Update asset download references to use SK

Browse Source 
Change-Id: If3e838f22f1b99fd7a3b1c6bca0affd39f5573b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449843
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2021-09-17 12:00:26 -04:00 committed by SkCQ
parent 5b7750bd66
commit 14cc21fd99
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/fetch-svgs
View File

@ -5,5 +5,11 @@
set -x set -x
set -e set -e
DOWNLOAD_SCRIPT=$(cd $(dirname $0)/..; pwd)/infra/bots/assets/svg/download.py ROOT_DIR="$(cd $(dirname $0)/..; pwd)"
python ${DOWNLOAD_SCRIPT} -t $(pwd)/svgs python3 ${ROOT_DIR}/bin/fetch-sk
case "$(uname -s)" in
CYGWIN*) SK_EXE="sk.exe";;
MINGW*) SK_EXE="sk.exe";;
*) SK_EXE="sk";;
esac
${ROOT_DIR}/bin/${SK_EXE} asset download svg $(pwd)/svgs

2
site/docs/dev/testing/xsan.md
View File

@ -31,7 +31,7 @@ This requires gsutil, part of the [gcloud sdk](https://cloud.google.com/sdk/down
<!--?prettify lang=sh?--> <!--?prettify lang=sh?-->
CLANGDIR="${HOME}/clang" CLANGDIR="${HOME}/clang"
python2 infra/bots/assets/clang_linux/download.py -t $CLANGDIR ./bin/sk asset download clang_linux $CLANGDIR
Building Clang binaries from scratch (Other users) Building Clang binaries from scratch (Other users)
--------------------------- ---------------------------

16
site/docs/user/build.md
View File

@ -134,9 +134,9 @@ If you do not have an NDK and have access to CIPD, you can use one of these
commands to fetch the NDK our bots use: commands to fetch the NDK our bots use:
``` ```
python2 infra/bots/assets/android_ndk_linux/download.py -t /tmp/ndk ./bin/sk asset download android_ndk_linux /tmp/ndk
python2 infra/bots/assets/android_ndk_darwin/download.py -t /tmp/ndk ./bin/sk asset download android_ndk_darwin /tmp/ndk
python2 infra/bots/assets/android_ndk_windows/download.py -t C:/ndk ./bin/sk.exe asset download android_ndk_windows C:/ndk
``` ```
When generating your GN build files, pass the path to your `ndk` and your When generating your GN build files, pass the path to your `ndk` and your
@ -176,10 +176,10 @@ files.
If you have access to CIPD, you can fetch all of these as follows: If you have access to CIPD, you can fetch all of these as follows:
``` ```
python2 infra/bots/assets/clang_linux/download.py -t /opt/clang ./bin/sk asset download clang_linux /opt/clang
python2 infra/bots/assets/armhf_sysroot/download.py -t /opt/armhf_sysroot ./bin/sk asset download armhf_sysroot /opt/armhf_sysroot
python2 infra/bots/assets/chromebook_arm_gles/download.py -t /opt/chromebook_arm_gles ./bin/sk asset download chromebook_arm_gles /opt/chromebook_arm_gles
python2 infra/bots/assets/chromebook_x86_64_gles/download.py -t /opt/chromebook_x86_64_gles ./bin/sk asset download chromebook_x86_64_gles /opt/chromebook_x86_64_gles
``` ```
If you don't have authorization to use those assets, then see the README.md If you don't have authorization to use those assets, then see the README.md
@ -328,7 +328,7 @@ Skia can be compiled with the free
The bots use a packaged 2019 toolchain, which Googlers can download like this: The bots use a packaged 2019 toolchain, which Googlers can download like this:
``` ```
python2 infra/bots/assets/win_toolchain/download.py -t C:/toolchain ./bin/sk.exe asset download win_toolchain C:/toolchain
``` ```
You can then pass the VC and SDK paths to GN by setting your GN args: You can then pass the VC and SDK paths to GN by setting your GN args:

4
tools/skpbench/README.md
View File

@ -14,9 +14,7 @@ The to build skia for android are at https://skia.org/user/build#android and rep
Download the Android NDK Download the Android NDK
``` ```
cipd auth-login ./bin/sk asset download android_ndk_linux /tmp/ndk
python2 infra/bots/assets/android_ndk_linux/download.py -t /tmp/ndk
``` ```
After this is set up once, build skpbench for your target cpu (assumed to be arm64 here for a Pixel 3) After this is set up once, build skpbench for your target cpu (assumed to be arm64 here for a Pixel 3)