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

[pathkit] build with newer emscripten

Browse Source 
Bug: skia:
Change-Id: I5576ec94cae42dd0e03079321e61f71292350808
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206389
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Kevin Lubick 2019-04-08 09:41:11 -04:00
parent 12b4902e50
commit 09d022cbb8
7 changed files with 7 additions and 8 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-EMCC-asmjs-Debug-PathKit.json
View File

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

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

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

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

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

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

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"--volume", "--volume",
"[START_DIR]/cache/docker/pathkit:/OUT", "[START_DIR]/cache/docker/pathkit:/OUT",
"gcr.io/skia-public/emsdk-release:1.38.16_v1", "gcr.io/skia-public/emsdk-release:1.38.27_v1",
"/SRC/skia/infra/pathkit/build_pathkit.sh" "/SRC/skia/infra/pathkit/build_pathkit.sh"
], ],
"env": { "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 # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.16_v1' DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.27_v1'
INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh' INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh'
BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [ BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [

4
modules/pathkit/Makefile
View File

@ -57,12 +57,12 @@ test-docker:
mkdir -p $$SKIA_ROOT/out/dockerbuild mkdir -p $$SKIA_ROOT/out/dockerbuild
docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \
gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/pathkit/build_pathkit.sh gcr.io/skia-public/emsdk-release:prod /SRC/infra/pathkit/build_pathkit.sh
cp ../../out/dockerbuild/pathkit.js ./npm-wasm/bin/test/pathkit.js cp ../../out/dockerbuild/pathkit.js ./npm-wasm/bin/test/pathkit.js
cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm
docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \
gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/pathkit/build_pathkit.sh asm.js gcr.io/skia-public/emsdk-release:prod /SRC/infra/pathkit/build_pathkit.sh asm.js
cp ../../out/dockerbuild/pathkit.js ./npm-asmjs/bin/test/pathkit.js cp ../../out/dockerbuild/pathkit.js ./npm-asmjs/bin/test/pathkit.js
cp ../../out/dockerbuild/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem cp ../../out/dockerbuild/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem

1
modules/pathkit/compile.sh
View File

@ -124,7 +124,6 @@ ${EMCXX} $RELEASE_CONF -std=c++14 \
-DSK_DISABLE_READBUFFER=1 \ -DSK_DISABLE_READBUFFER=1 \
-fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \ -fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
$WASM_CONF \ $WASM_CONF \
-s BINARYEN_IGNORE_IMPLICIT_TRAPS=1 \
-s ERROR_ON_MISSING_LIBRARIES=1 \ -s ERROR_ON_MISSING_LIBRARIES=1 \
-s ERROR_ON_UNDEFINED_SYMBOLS=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-s EXPORT_NAME="PathKitInit" \ -s EXPORT_NAME="PathKitInit" \