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

[canvaskit] Update to emsdk 2.0.10

Browse Source 
(also update pathkit).

Bug: skia:11077
Change-Id: I7d06e05ed8f445313bedee055af5ded79c7b40b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/343505
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Kevin Lubick 2020-12-14 10:07:08 -05:00
parent 371967f791
commit 035cd91cfb
16 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/build/canvaskit.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/canvaskit-emsdk:2.0.6_v1'
DOCKER_IMAGE = 'gcr.io/skia-public/canvaskit-emsdk:2.0.10_v1'
INNER_BUILD_SCRIPT = '/SRC/skia/infra/canvaskit/build_canvaskit.sh'

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/pathkit:/OUT",
"gcr.io/skia-public/emsdk-base:2.0.6_v1",
"gcr.io/skia-public/emsdk-base:2.0.10_v1",
"/SRC/skia/infra/pathkit/build_pathkit.sh",
"debug",
"asm.js"

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/pathkit:/OUT",
"gcr.io/skia-public/emsdk-base:2.0.6_v1",
"gcr.io/skia-public/emsdk-base:2.0.10_v1",
"/SRC/skia/infra/pathkit/build_pathkit.sh",
"asm.js"
],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/canvaskit:/OUT",
"gcr.io/skia-public/canvaskit-emsdk:2.0.6_v1",
"gcr.io/skia-public/canvaskit-emsdk:2.0.10_v1",
"/SRC/skia/infra/canvaskit/build_canvaskit.sh",
"debug"
],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/pathkit:/OUT",
"gcr.io/skia-public/emsdk-base:2.0.6_v1",
"gcr.io/skia-public/emsdk-base:2.0.10_v1",
"/SRC/skia/infra/pathkit/build_pathkit.sh",
"debug"
],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/canvaskit:/OUT",
"gcr.io/skia-public/canvaskit-emsdk:2.0.6_v1",
"gcr.io/skia-public/canvaskit-emsdk:2.0.10_v1",
"/SRC/skia/infra/canvaskit/build_canvaskit.sh",
"cpu"
],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC",
"--volume",
"[START_DIR]/cache/docker/pathkit:/OUT",
"gcr.io/skia-public/emsdk-base:2.0.6_v1",
"gcr.io/skia-public/emsdk-base:2.0.10_v1",
"/SRC/skia/infra/pathkit/build_pathkit.sh"
],
"env": {

2
infra/bots/recipe_modules/build/pathkit.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/emsdk-base:2.0.6_v1'
DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-base:2.0.10_v1'
INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh'
def compile_fn(api, checkout_root, _ignore):

2
infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go
View File

@ -20,7 +20,7 @@ import (
"go.skia.org/infra/task_driver/go/td"
)
const dockerImage = "gcr.io/skia-public/canvaskit-emsdk:2.0.6_v1"
const dockerImage = "gcr.io/skia-public/canvaskit-emsdk:2.0.10_v1"
const innerBuildScript = "/SRC/infra/canvaskit/build_gmtests.sh"
func main() {

2
infra/canvaskit/docker/Makefile
View File

@ -1,4 +1,4 @@
EMSDK_VERSION=2.0.6_v1
EMSDK_VERSION=2.0.10_v1
publish_canvaskit_emsdk:
docker build -t canvaskit-emsdk ./canvaskit-emsdk/

2
infra/canvaskit/docker/canvaskit-emsdk/Dockerfile
View File

@ -1,7 +1,7 @@
# A Docker image that augments the Emscripten SDK Docker image
# with anything needed to build Canvaskit
FROM gcr.io/skia-public/emsdk-base:2.0.6_v1
FROM gcr.io/skia-public/emsdk-base:2.0.10_v1
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
libfreetype6-dev

2
infra/wasm-common/docker/Makefile
View File

@ -1,4 +1,4 @@
EMSDK_VERSION=2.0.6_v1
EMSDK_VERSION=2.0.10_v1
# Can check CHROME_VERSION with
# docker run karma-chrome-tests /usr/bin/google-chrome-stable --version

2
infra/wasm-common/docker/emsdk-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.6
FROM emscripten/emsdk:2.0.10
RUN apt update && apt install -y python

1
modules/canvaskit/CHANGELOG.md
View File

@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
(and continues to do so).
- The Canvas2D emulation layer always uses high quality image smoothing (this drastically
simplifies the underlying code).
- We now compile CanvasKit with emsdk 2.0.10 when testing and deploying to npm.
### Fixed
- `Canvas.drawPoints` correctly takes a flattened Array or TypedArray of points (as the

8
modules/canvaskit/Makefile
View File

@ -30,7 +30,7 @@ debug:
mkdir -p ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.js ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
#cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
debug_cpu:
# Does an incremental build where possible.
@ -38,7 +38,7 @@ debug_cpu:
mkdir -p ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.js ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
#cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
experimental_simd:
# Does an incremental build where possible.
@ -46,7 +46,7 @@ experimental_simd:
mkdir -p ./canvaskit/bin
cp ../../out/canvaskit_wasm_experimental_simd/canvaskit.js ./canvaskit/bin
cp ../../out/canvaskit_wasm_experimental_simd/canvaskit.wasm ./canvaskit/bin
cp ../../out/canvaskit_wasm_experimental_simd/canvaskit.wasm.map ./canvaskit/bin
#cp ../../out/canvaskit_wasm_experimental_simd/canvaskit.wasm.map ./canvaskit/bin
debug_viewer:
# Does an incremental build where possible.
@ -54,7 +54,7 @@ debug_viewer:
mkdir -p ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.js ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm ./canvaskit/bin
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
#cp ../../out/canvaskit_wasm_debug/canvaskit.wasm.map ./canvaskit/bin
profile:
./compile.sh profiling

2
modules/pathkit/CHANGELOG.md
View File

@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Changed
- Now compile with emsdk 2.0.6
- Now compile with emsdk 2.0.10
## [0.7.0] 2019-07-20