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

Revert "Build CanvasKit using GN/Ninja"

Browse Source 
This reverts commit ecac712bec.

Reason for revert: possibly breaking flutter, definitely breaking docker wasm builds

Original change's description:
> Build CanvasKit using GN/Ninja
>
> Build with
>
> ./bin/gn gen out/wasm_debug '--args=target_cpu="wasm"'
>
> or
>
> ./bin/gn gen out/wasm_release '--args=target_cpu="wasm" is_debug=false'
>
> Change-Id: Ib74586bf8397d57064a3899eaa6da76f9bce9049
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502036
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>

Change-Id: I04dbb3b1cff7511064f603d7dc7c8a4168bf0d56
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507616
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Kevin Lubick 2022-02-11 13:34:45 +00:00
parent ecac712bec
commit a59af6e4f2
20 changed files with 283 additions and 637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BUILD.gn
View File

@ -7,7 +7,6 @@ import("gn/flutter_defines.gni")
import("gn/fuchsia_defines.gni")
import("gn/shared_sources.gni")
import("gn/skia.gni")
import("gn/toolchain/wasm.gni")
if (is_fuchsia) {
import("//build/fuchsia/sdk.gni")
@ -48,9 +47,6 @@ config("skia_public") {
if (is_fuchsia) {
defines += fuchsia_defines
}
if (is_wasm) {
defines += wasm_defines
}
if (skia_gl_standard == "gles") {
defines += [ "SK_ASSUME_GL_ES=1" ]
} else if (skia_gl_standard == "gl") {
@ -88,7 +84,7 @@ config("skia_private") {
"SK_GAMMA_CONTRAST=0.0",
]
}
if (is_skia_dev_build && !is_wasm) {
if (is_skia_dev_build) {
defines += [
"SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
"GR_TEST_UTILS=1",
@ -1546,10 +1542,6 @@ group("modules") {
"modules/skshaper",
"modules/svg",
]
if (is_wasm) {
deps += [ "modules/canvaskit" ]
}
}
group("experimental") {
@ -2955,7 +2947,7 @@ if (skia_enable_tools) {
group("modules_testonly") {
testonly = true
deps = []
if (is_wasm) {
if (target_cpu == "wasm") {
deps += [ "modules/canvaskit:viewer_wasm" ]
}
}

1
DEPS
View File

@ -23,7 +23,6 @@ deps = {
"third_party/externals/abseil-cpp" : "https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@789af048b388657987c59d4da406859034fe310f",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/emsdk" : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@fc645b7626ebf86530dbd82fbece74d457e7ae07",
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee",
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@5e9caaee7885cbc82f9f821bbec7f6c86f25b33a",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@a8b7f1880412c7f0c9ecdada0a4935011816c7dc",

32
bin/activate-emsdk
View File

@ -1,32 +0,0 @@
#!/usr/bin/env python
# Copyright 2022 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import os
import subprocess
import sys
EMSDK_ROOT = os.path.join('third_party', 'externals', 'emsdk')
EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
EMSDK_VERSION = '3.1.0'
def main():
try:
subprocess.check_call([sys.executable, EMSDK_PATH, 'install', EMSDK_VERSION])
except subprocess.CalledProcessError:
print ('Failed to install emsdk')
return 1
try:
subprocess.check_call([sys.executable, EMSDK_PATH, 'activate', EMSDK_VERSION])
except subprocess.CalledProcessError:
print ('Failed to activate emsdk')
return 1
if __name__ == '__main__':
sys.exit(main())

7
gn/BUILDCONFIG.gn
View File

@ -59,7 +59,6 @@ is_ios = current_os == "ios" || current_os == "tvos"
is_tvos = current_os == "tvos"
is_linux = current_os == "linux"
is_mac = current_os == "mac"
is_wasm = target_os == "wasm"
is_win = current_os == "win"
# This is just to make the Dawn build files happy. Skia itself uses target_os = "linux"
@ -82,7 +81,7 @@ if (current_cpu == "") {
current_cpu = target_cpu
}
is_clang = is_android || is_ios || is_mac || is_fuchsia || is_wasm ||
is_clang = is_android || is_ios || is_mac || is_fuchsia ||
(cc == "clang" && cxx == "clang++") || clang_win != ""
if (!is_clang && !is_win) {
is_clang = exec_script("//gn/is_clang.py",
@ -227,10 +226,6 @@ if (is_win) {
set_default_toolchain("//gn/toolchain:msvc")
default_toolchain_name = "msvc"
host_toolchain = "msvc"
} else if (is_wasm) {
set_default_toolchain("//gn/toolchain:wasm")
default_toolchain_name = "wasm"
host_toolchain = "wasm"
} else {
# GCC-like toolchains, including Clang.
set_default_toolchain("//gn/toolchain:gcc_like")

28
gn/skia.gni
View File

@ -20,9 +20,8 @@ declare_args() {
skia_enable_fontmgr_fuchsia = is_fuchsia
skia_enable_fontmgr_win = is_win
skia_enable_gpu = true
skia_enable_pdf = !is_wasm
skia_enable_skottie = !(is_win && is_component_build) ||
(is_wasm && skia_canvaskit_enable_skottie)
skia_enable_pdf = true
skia_enable_skottie = !(is_win && is_component_build)
skia_enable_skrive = true
skia_enable_sksl = true
skia_enable_skvm_jit_when_possible = is_skia_dev_build
@ -42,12 +41,12 @@ declare_args() {
skia_use_dawn = false
skia_use_direct3d = false
skia_use_egl = false
skia_use_expat = !is_wasm
skia_use_expat = true
skia_use_ffmpeg = false
skia_use_fixed_gamma_text = is_android
skia_use_fontconfig = is_linux
skia_use_fonthost_mac = is_mac || is_ios
skia_use_freetype = is_android || is_fuchsia || is_linux || is_wasm
skia_use_freetype = is_android || is_fuchsia || is_linux
skia_use_harfbuzz = true
skia_use_gl = !is_fuchsia
skia_use_icu = !is_fuchsia
@ -58,14 +57,14 @@ declare_args() {
skia_use_libpng_decode = true
skia_use_libpng_encode = true
skia_use_libwebp_decode = true
skia_use_libwebp_encode = !is_wasm
skia_use_libwebp_encode = true
skia_use_lua = is_skia_dev_build && !is_ios
skia_use_metal = false
skia_use_ndk_images = is_android && defined(ndk_api) && ndk_api >= 30
skia_use_piex = !is_win && !is_wasm
skia_use_piex = !is_win
skia_use_sfml = false
skia_use_webgl = is_wasm
skia_use_wuffs = is_wasm
skia_use_webgl = false
skia_use_wuffs = false
skia_use_x11 = is_linux
skia_use_xps = true
skia_enable_graphite = false
@ -77,15 +76,11 @@ declare_args() {
skia_ios_identity = ".*Google.*"
skia_ios_profile = "Google Development"
}
}
declare_args() {
if (is_mac) {
skia_gl_standard = "gl"
} else if (is_ios) {
skia_gl_standard = "gles"
} else if (is_wasm && skia_enable_gpu) {
skia_gl_standard = "webgl"
} else {
skia_gl_standard = ""
}
@ -109,17 +104,16 @@ declare_args() {
declare_args() {
skia_compile_sksl_tests = skia_compile_processors
skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
skia_enable_fontmgr_custom_directory =
skia_use_freetype && !is_fuchsia && !is_wasm
skia_enable_fontmgr_custom_directory = skia_use_freetype && !is_fuchsia
skia_enable_fontmgr_custom_embedded = skia_use_freetype && !is_fuchsia
skia_enable_fontmgr_custom_empty = skia_use_freetype && !is_wasm
skia_enable_fontmgr_custom_empty = skia_use_freetype
skia_enable_fontmgr_fontconfig = skia_use_freetype && skia_use_fontconfig
skia_enable_fontmgr_win_gdi = is_win && !skia_enable_winuwp
skia_enable_fontmgr_FontConfigInterface =
skia_use_freetype && skia_use_fontconfig
skia_enable_spirv_validation = is_skia_dev_build && is_debug && !skia_use_dawn
skia_use_dng_sdk =
!is_fuchsia && !is_wasm && skia_use_libjpeg_turbo_decode && skia_use_zlib
!is_fuchsia && skia_use_libjpeg_turbo_decode && skia_use_zlib
skia_use_libgifcodec = !skia_use_wuffs
skia_use_sfntly = skia_use_icu
skia_enable_vulkan_debug_layers = skia_enable_gpu_debug_layers

14
gn/skia/BUILD.gn
View File

@ -6,9 +6,6 @@
if (is_fuchsia) {
import("//build/fuchsia/sdk.gni")
}
if (is_wasm) {
import("//gn/toolchain/wasm.gni")
}
declare_args() {
extra_asmflags = []
@ -270,17 +267,6 @@ config("default") {
}
}
if (is_wasm) {
cflags += [
"--sysroot=$emsdk_dir/upstream/emscripten/cache/sysroot",
"-sMAIN_MODULE=1",
]
if (skia_canvaskit_enable_experimental_simd) {
cflags += [ "-msimd128" ]
}
ldflags += [ "--sysroot=$emsdk_dir/upstream/emscripten/cache/sysroot" ]
}
if (sanitize != "" && sanitize != "MSVC") {
# You can either pass the sanitizers directly, e.g. "address,undefined",
# or pass one of the couple common aliases used by the bots.

15
gn/toolchain/BUILD.gn
View File

@ -1,6 +1,3 @@
if (is_wasm) {
import("wasm.gni")
}
if (is_fuchsia) {
import("//build/fuchsia/sdk.gni")
}
@ -422,15 +419,3 @@ gcc_like_toolchain("gcc_like_host") {
cxx = host_cxx
link = host_link
}
# Only define this toolchain if actually building for wasm.
if (is_wasm) {
gcc_like_toolchain("wasm") {
cpu = "wasm"
os = "wasm"
ar = "$emsdk_dir/upstream/emscripten/emar"
cc = "$emsdk_dir/upstream/emscripten/emcc"
cxx = "$emsdk_dir/upstream/emscripten/em++"
link = cxx
}
}

66
gn/toolchain/wasm.gni
View File

@ -1,66 +0,0 @@
# Copyright (c) 2022 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Defines the configuration of emscripten for building WASM targets.
import("//gn/skia.gni")
import("//modules/canvaskit/canvaskit.gni")
declare_args() {
# The location of an activated embedded emsdk.
emsdk_dir = rebase_path("//third_party/externals/emsdk")
}
wasm_toolchain = "//gn/toolchain:wasm"
is_wasm = target_os == "wasm"
em_config_path = "$emsdk_dir/.emscripten"
# Defines a WASM library target.
template("wasm_lib") {
_vars_to_forward = [
"cflags",
"ldflags",
"defines",
"deps",
"includes",
"sources",
"include_dirs",
"public_configs",
"testonly",
"visibility",
]
_lib_name = target_name
executable("${_lib_name}.js") {
forward_variables_from(invoker, _vars_to_forward)
output_extension = ""
}
group("$_lib_name") {
deps = [ ":${_lib_name}.js($wasm_toolchain)" ]
}
}
wasm_defines = [
"SKNX_NO_SIMD",
"SK_DISABLE_AAA",
"SK_FORCE_8_BYTE_ALIGNMENT",
]
if (!is_debug && !skia_canvaskit_force_tracing) {
wasm_defines += [ "SK_DISABLE_TRACING" ]
}
if (skia_enable_gpu) {
wasm_defines += [ "SK_DISABLE_LEGACY_SHADERCONTEXT" ]
}
if (!skia_canvaskit_enable_effects_deserialization ||
!skia_canvaskit_enable_skp_serialization) {
wasm_defines += [ "SK_DISABLE_EFFECT_DESERIALIZATION" ]
}
if (!skia_canvaskit_enable_alias_font) {
wasm_defines += [ "CANVASKIT_NO_ALIAS_FONT" ]
}

402
modules/canvaskit/BUILD.gn
View File

@ -2,362 +2,54 @@
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//gn/skia.gni")
import("//gn/toolchain/wasm.gni")
import("canvaskit.gni")
# These targets depend on components that are only declared if
# `skia_enable_tools` is true.
if (skia_enable_tools) {
component("viewer_wasm") {
testonly = true
include_dirs = [ "../.." ]
sources = [
"../../modules/svg/src/SkSVGAttribute.cpp",
"../../modules/svg/src/SkSVGAttributeParser.cpp",
"../../modules/svg/src/SkSVGCircle.cpp",
"../../modules/svg/src/SkSVGClipPath.cpp",
"../../modules/svg/src/SkSVGContainer.cpp",
"../../modules/svg/src/SkSVGDOM.cpp",
"../../modules/svg/src/SkSVGEllipse.cpp",
"../../modules/svg/src/SkSVGFe.cpp",
"../../modules/svg/src/SkSVGFeColorMatrix.cpp",
"../../modules/svg/src/SkSVGFeComposite.cpp",
"../../modules/svg/src/SkSVGFeTurbulence.cpp",
"../../modules/svg/src/SkSVGFilter.cpp",
"../../modules/svg/src/SkSVGFilterContext.cpp",
"../../modules/svg/src/SkSVGGradient.cpp",
"../../modules/svg/src/SkSVGLine.cpp",
"../../modules/svg/src/SkSVGLinearGradient.cpp",
"../../modules/svg/src/SkSVGNode.cpp",
"../../modules/svg/src/SkSVGPath.cpp",
"../../modules/svg/src/SkSVGPattern.cpp",
"../../modules/svg/src/SkSVGPoly.cpp",
"../../modules/svg/src/SkSVGRadialGradient.cpp",
"../../modules/svg/src/SkSVGRect.cpp",
"../../modules/svg/src/SkSVGRenderContext.cpp",
"../../modules/svg/src/SkSVGSVG.cpp",
"../../modules/svg/src/SkSVGShape.cpp",
"../../modules/svg/src/SkSVGStop.cpp",
"../../modules/svg/src/SkSVGText.cpp",
"../../modules/svg/src/SkSVGTransformableNode.cpp",
"../../modules/svg/src/SkSVGUse.cpp",
"../../modules/svg/src/SkSVGValue.cpp",
"../../tools/viewer/SKPSlide.cpp",
"../../tools/viewer/SampleSlide.cpp",
"../../tools/viewer/SvgSlide.cpp",
]
deps = [ "../..:samples" ]
}
component("gm_wasm") {
testonly = true
include_dirs = [ "../.." ]
deps = [
"../..:hash_and_encode",
"../..:tool_utils",
"../../modules/svg:svg",
]
}
}
action("create_notomono_cpp") {
script = "../../tools/embed_resources.py"
inputs = [ "fonts/NotoMono-Regular.ttf" ]
outputs =
[ "$root_out_dir/modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp" ]
args = [
"--name=SK_EMBEDDED_FONTS",
"--input",
rebase_path("fonts/NotoMono-Regular.ttf"),
"--output",
"modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp",
"--align=4",
]
}
wasm_lib("canvaskit") {
deps = [ "../..:skia" ]
if (skia_canvaskit_enable_paragraph) {
deps += [ "../../modules/skparagraph:skparagraph" ]
}
if (skia_canvaskit_enable_skottie) {
deps += [
"../../modules/skottie:skottie",
"../../modules/sksg:sksg",
]
}
if (skia_canvaskit_enable_particles) {
deps += [ "../../modules/particles:particles" ]
}
if (skia_canvaskit_enable_skottie || skia_canvaskit_enable_particles) {
deps += [ "../../modules/skresources:skresources" ]
}
if (skia_canvaskit_include_viewer) {
deps += [ ":viewer_wasm" ]
}
if (skia_canvaskit_enable_embedded_font) {
deps += [ ":create_notomono_cpp" ]
}
component("viewer_wasm") {
testonly = true
include_dirs = [ "../.." ]
sources = [
"WasmCommon.h",
"canvaskit_bindings.cpp",
"../../modules/svg/src/SkSVGAttribute.cpp",
"../../modules/svg/src/SkSVGAttributeParser.cpp",
"../../modules/svg/src/SkSVGCircle.cpp",
"../../modules/svg/src/SkSVGClipPath.cpp",
"../../modules/svg/src/SkSVGContainer.cpp",
"../../modules/svg/src/SkSVGDOM.cpp",
"../../modules/svg/src/SkSVGEllipse.cpp",
"../../modules/svg/src/SkSVGFe.cpp",
"../../modules/svg/src/SkSVGFeColorMatrix.cpp",
"../../modules/svg/src/SkSVGFeComposite.cpp",
"../../modules/svg/src/SkSVGFeTurbulence.cpp",
"../../modules/svg/src/SkSVGFilter.cpp",
"../../modules/svg/src/SkSVGFilterContext.cpp",
"../../modules/svg/src/SkSVGGradient.cpp",
"../../modules/svg/src/SkSVGLine.cpp",
"../../modules/svg/src/SkSVGLinearGradient.cpp",
"../../modules/svg/src/SkSVGNode.cpp",
"../../modules/svg/src/SkSVGPath.cpp",
"../../modules/svg/src/SkSVGPattern.cpp",
"../../modules/svg/src/SkSVGPoly.cpp",
"../../modules/svg/src/SkSVGRadialGradient.cpp",
"../../modules/svg/src/SkSVGRect.cpp",
"../../modules/svg/src/SkSVGRenderContext.cpp",
"../../modules/svg/src/SkSVGSVG.cpp",
"../../modules/svg/src/SkSVGShape.cpp",
"../../modules/svg/src/SkSVGStop.cpp",
"../../modules/svg/src/SkSVGText.cpp",
"../../modules/svg/src/SkSVGTransformableNode.cpp",
"../../modules/svg/src/SkSVGUse.cpp",
"../../modules/svg/src/SkSVGValue.cpp",
"../../tools/viewer/SKPSlide.cpp",
"../../tools/viewer/SampleSlide.cpp",
"../../tools/viewer/SvgSlide.cpp",
]
deps = [ "../..:samples" ]
}
component("gm_wasm") {
testonly = true
include_dirs = [ "../.." ]
deps = [
"../..:hash_and_encode",
"../..:tool_utils",
"../../modules/svg:svg",
]
if (skia_canvaskit_enable_paragraph) {
sources += [
"paragraph_bindings.cpp",
"paragraph_bindings_gen.cpp",
]
}
if (skia_canvaskit_enable_skottie) {
sources += [ "skottie_bindings.cpp" ]
if (skia_canvaskit_enable_managed_skottie) {
sources += [ "../../modules/skottie/utils/SkottieUtils.cpp" ]
}
}
if (skia_canvaskit_enable_particles) {
sources += [ "particles_bindings.cpp" ]
}
if (skia_canvaskit_enable_skottie || skia_canvaskit_enable_particles) {
sources += [ "../../modules/skresources/src/SkResources.cpp" ]
}
if (skia_canvaskit_include_viewer) {
sources += [ "viewer_bindings.cpp" ]
}
if (skia_canvaskit_enable_embedded_font) {
sources += [
"$root_out_dir/modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp",
]
}
ldflags = []
if (is_debug) {
ldflags += [
"-O0",
"-sDEMANGLE_SUPPORT=1",
"-sASSERTIONS=1",
"-sGL_ASSERTIONS=1",
"-g3",
"--source-map-base",
"/node_modules/canvaskit/bin/",
"--pre-js",
rebase_path("debug.js"),
]
} else {
externs_path = rebase_path("externs.js")
ldflags += [
"-Oz",
"--closure=1",
"--pre-js",
rebase_path("release.js"),
"--closure-args=--externs=$externs_path",
]
}
if (skia_canvaskit_profile_build) {
ldflags += [
"--profiling-funcs",
"--closure=0",
]
}
ldflags += [ "-fno-rtti" ]
if (skia_enable_gpu) {
ldflags += [
"-lGL",
"--pre-js",
rebase_path("cpu.js"),
"--pre-js",
rebase_path("gpu.js"),
"-sUSE_WEBGL2=1",
"-sMAX_WEBGL_VERSION=2",
]
} else {
ldflags += [
"--pre-js",
rebase_path("cpu.js"),
"-sUSE_WEBGL2=0",
]
}
ldflags += [
"-std=c++17",
"--bind",
"--no-entry",
"--pre-js",
rebase_path("preamble.js"),
"--pre-js",
rebase_path("color.js"),
"--pre-js",
rebase_path("memory.js"),
"--pre-js",
rebase_path("util.js"),
"--pre-js",
rebase_path("interface.js"),
]
if (skia_canvaskit_enable_matrix_helper) {
ldflags += [
"--pre-js",
rebase_path("matrix.js"),
]
}
ldflags += [
"--pre-js",
rebase_path("paragraph.js"),
]
if (skia_canvaskit_enable_skottie) {
ldflags += [
"--pre-js",
rebase_path("skottie.js"),
]
}
if (skia_canvaskit_enable_particles) {
ldflags += [
"--pre-js",
rebase_path("particles.js"),
]
}
if (skia_canvaskit_enable_pathops) {
ldflags += [
"--pre-js",
rebase_path("pathops.js"),
]
}
if (skia_canvaskit_enable_font) {
ldflags += [
"--pre-js",
rebase_path("font.js"),
]
}
if (skia_canvaskit_enable_skp_serialization) {
ldflags += [
"--pre-js",
rebase_path("skp.js"),
]
}
if (skia_canvaskit_enable_rt_shader) {
ldflags += [
"--pre-js",
rebase_path("rt_shader.js"),
]
}
if (skia_canvaskit_enable_canvas_bindings) {
ldflags += [
"--pre-js",
rebase_path("htmlcanvas/preamble.js"),
"--pre-js",
rebase_path("htmlcanvas/util.js"),
"--pre-js",
rebase_path("htmlcanvas/color.js"),
"--pre-js",
rebase_path("htmlcanvas/font.js"),
"--pre-js",
rebase_path("htmlcanvas/canvas2dcontext.js"),
"--pre-js",
rebase_path("htmlcanvas/htmlcanvas.js"),
"--pre-js",
rebase_path("htmlcanvas/htmlimage.js"),
"--pre-js",
rebase_path("htmlcanvas/imagedata.js"),
"--pre-js",
rebase_path("htmlcanvas/lineargradient.js"),
"--pre-js",
rebase_path("htmlcanvas/path2d.js"),
"--pre-js",
rebase_path("htmlcanvas/pattern.js"),
"--pre-js",
rebase_path("htmlcanvas/radialgradient.js"),
"--pre-js",
rebase_path("htmlcanvas/postamble.js"),
]
}
ldflags += [
"--pre-js",
rebase_path("postamble.js"),
"-sLLD_REPORT_UNDEFINED",
"-sALLOW_MEMORY_GROWTH",
"-sUSE_PTHREADS=0",
"-sDISABLE_EXCEPTION_CATCHING",
"-sNODEJS_CATCH_EXIT=0",
"-sDYNAMIC_EXECUTION=0",
"-sEXPORT_NAME=CanvasKitInit",
"-sEXPORTED_FUNCTIONS=[_malloc,_free]",
"-sFORCE_FILESYSTEM=0",
"-sFILESYSTEM=0",
"-sMODULARIZE",
"-sNO_EXIT_RUNTIME=1",
"-sINITIAL_MEMORY=128MB",
"-sWASM",
"-sSTRICT=1",
]
defines = []
if (is_debug) {
defines += [ "SK_DEBUG" ]
} else {
defines += [ "SK_RELEASE" ]
}
if (!is_debug && !skia_canvaskit_force_tracing) {
defines += [ "SK_DISABLE_TRACING" ]
}
defines += [
"SK_DISABLE_AAA",
"SK_FORCE_8_BYTE_ALIGNMENT",
"EMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0",
"SK_HAS_ANDROID_CODEC",
"SK_SHAPER_HARFBUZZ_AVAILABLE",
]
if (skia_canvaskit_enable_paragraph) {
defines += [ "SK_INCLUDE_PARAGRAPH=1" ]
}
if (skia_canvaskit_enable_skp_serialization) {
defines += [ "SK_SERIALIZE_SKP" ]
}
if (skia_enable_gpu) {
defines += [
"SK_SUPPORT_GPU=1",
"SK_GL",
"SK_DISABLE_LEGACY_SHADERCONTEXT",
]
} else {
defines += [
"SK_SUPPORT_GPU=0",
"SK_ENABLE_SKSL",
]
}
if (!skia_canvaskit_enable_skottie ||
!skia_canvaskit_enable_managed_skottie) {
defines += [ "SK_INCLUDE_MANAGED_SKOTTIE=0" ]
} else {
defines += [ "SK_INCLUDE_MANAGED_SKOTTIE=1" ]
}
if (skia_canvaskit_enable_pathops) {
defines += [ "SK_INCLUDE_PATHOPS" ]
}
if (skia_canvaskit_enable_rt_shader) {
defines += [ "SK_INCLUDE_RUNTIME_EFFECT" ]
}
if (skia_canvaskit_enable_sksl_trace) {
defines += [ "SK_INCLUDE_SKSL_TRACE" ]
}
if (!skia_canvaskit_enable_alias_font) {
defines += [ "CANVASKIT_NO_ALIAS_FONT" ]
}
if (!skia_canvaskit_enable_font) {
defines += [ "SK_NO_FONTS" ]
}
}

34
modules/canvaskit/canvaskit.gni
View File

@ -1,34 +0,0 @@
# Copyright 2022 Google LLC. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
declare_args() {
skia_canvaskit_enable_canvas_bindings = true
skia_canvaskit_enable_skottie = true
skia_canvaskit_enable_managed_skottie = true
skia_canvaskit_enable_pathops = true
skia_canvaskit_enable_particles = true
skia_canvaskit_enable_rt_shader = true
skia_canvaskit_enable_sksl_trace = true
skia_canvaskit_enable_alias_font = true
skia_canvaskit_enable_skp_serialization = true
skia_canvaskit_enable_effects_deserialization = true
skia_canvaskit_enable_matrix_helper = true
skia_canvaskit_enable_font = true
skia_canvaskit_enable_embedded_font = true
skia_canvaskit_enable_paragraph = true
skia_canvaskit_enable_experimental_simd = false
skia_canvaskit_include_viewer = false
skia_canvaskit_force_tracing = false
skia_canvaskit_profile_build = false
}
# Assert that skia_canvaskit_profile_build implies release mode.
assert(
!skia_canvaskit_profile_build || !is_debug,
"If you set `skia_canvaskit_profile_build=true` you must set `is_debug=false`.")
# Assert that skia_canvaskit_enable_embedded_font implies skia_canvaskit_enable_font.
assert(
!skia_canvaskit_enable_embedded_font || skia_canvaskit_enable_font,
"If you set `skia_canvaskit_enable_embedded_font=true` you must set `skia_canvaskit_enable_font=true`.")

277
modules/canvaskit/compile.sh
View File

@ -21,26 +21,30 @@ fi
pushd $BASE_DIR/../..
source $EMSDK/emsdk_env.sh
EMCC=`which emcc`
EMCXX=`which em++`
EMAR=`which emar`
RELEASE_CONF="-Oz --closure 1 -DSK_RELEASE --pre-js $BASE_DIR/release.js"
EXTRA_CFLAGS="\"-DSK_RELEASE\","
IS_OFFICIAL_BUILD="true"
IS_DEBUG="false"
FORCE_TRACING="false"
PROFILE_BUILD="false"
# Tracing will be disabled in release/profiling unless this flag is seen. Tracing will
# be on debug builds always.
if [[ $@ != *force_tracing* ]] ; then
FORCE_TRACING="true"
RELEASE_CONF+=" -DSK_DISABLE_TRACING"
EXTRA_CFLAGS+="\"-DSK_DISABLE_TRACING\","
fi
if [[ $@ == *debug* ]]; then
echo "Building a Debug build"
IS_DEBUG="true"
IS_OFFICIAL_BUILD="false"
EXTRA_CFLAGS="\"-DSK_DEBUG\","
RELEASE_CONF="-O0 --js-opts 0 -sDEMANGLE_SUPPORT=1 -sASSERTIONS=1 -sGL_ASSERTIONS=1 -g3 \
--source-map-base /node_modules/canvaskit/bin/ -DSK_DEBUG --pre-js $BASE_DIR/debug.js"
BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm_debug"}
elif [[ $@ == *profiling* ]]; then
echo "Building a build for profiling"
PROFILE_BUILD="true"
RELEASE_CONF+=" --profiling-funcs --closure 0"
BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm_profile"}
elif [[ $@ == *simd* ]]; then
echo "Building with SIMD operations"
@ -49,9 +53,9 @@ else
BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm"}
fi
BUILD_WITH_SIMD="false"
if [[ $@ == *simd* ]]; then
BUILD_WITH_SIMD="true"
RELEASE_CONF+=" -msimd128"
EXTRA_CFLAGS+="\"-msimd128\","
fi
mkdir -p $BUILD_DIR
@ -59,99 +63,148 @@ mkdir -p $BUILD_DIR
# we get a fresh build.
rm -f $BUILD_DIR/*.a
ENABLE_GPU="true"
GN_GPU="skia_enable_gpu=true skia_gl_standard = \"webgl\""
GN_GPU_FLAGS="\"-DSK_DISABLE_LEGACY_SHADERCONTEXT\","
WASM_GPU="-lGL -DSK_SUPPORT_GPU=1 -DSK_GL \
-DSK_DISABLE_LEGACY_SHADERCONTEXT --pre-js $BASE_DIR/cpu.js --pre-js $BASE_DIR/gpu.js\
-sUSE_WEBGL2=1"
if [[ $@ == *cpu* ]]; then
echo "Using the CPU backend instead of the GPU backend"
ENABLE_GPU="false"
GN_GPU="skia_enable_gpu=false"
GN_GPU_FLAGS=""
WASM_GPU="-DSK_SUPPORT_GPU=0 -DSK_ENABLE_SKSL --pre-js $BASE_DIR/cpu.js -sUSE_WEBGL2=0"
fi
SERIALIZE_SKP="true"
SKP_JS="--pre-js $BASE_DIR/skp.js"
GN_SKP_FLAGS=""
WASM_SKP="-DSK_SERIALIZE_SKP"
if [[ $@ == *no_skp_serialization* ]]; then
# This saves about 20kb compressed.
echo "disabling SKP serialization"
SERIALIZE_SKP="false"
SKP_JS=""
WASM_SKP=""
GN_SKP_FLAGS="\"-DSK_DISABLE_EFFECT_DESERIALIZATION\","
fi
DESERIALIZE_EFFECTS="true"
if [[ $@ == *no_effects_deserialization* ]]; then
# This saves about 60kb compressed.
echo "disabling effects deserialization"
DESERIALIZE_EFFECTS="false"
GN_SKP_FLAGS="\"-DSK_DISABLE_EFFECT_DESERIALIZATION\","
fi
ENABLE_SKOTTIE="true"
SKOTTIE_JS="--pre-js $BASE_DIR/skottie.js"
SKOTTIE_BINDINGS="$BASE_DIR/skottie_bindings.cpp"
SKOTTIE_LIB="$BUILD_DIR/libskottie.a \
$BUILD_DIR/libsksg.a"
if [[ $@ == *no_skottie* ]]; then
echo "Omitting Skottie"
ENABLE_SKOTTIE="false"
SKOTTIE_JS=""
SKOTTIE_LIB=""
SKOTTIE_BINDINGS=""
fi
INCLUDE_VIEWER="false"
USE_EXPAT="false"
GN_VIEWER="skia_use_expat=false"
VIEWER_BINDINGS=""
VIEWER_LIB=""
if [[ $@ == *viewer* ]]; then
echo "Including viewer"
INCLUDE_VIEWER="true"
USE_EXPAT="true"
GN_VIEWER="skia_use_expat=true"
VIEWER_BINDINGS="$BASE_DIR/viewer_bindings.cpp"
VIEWER_LIB="$BUILD_DIR/libviewer_wasm.a"
IS_OFFICIAL_BUILD="false"
fi
ENABLE_MANAGED_SKOTTIE="true"
MANAGED_SKOTTIE_BINDINGS="\
-DSK_INCLUDE_MANAGED_SKOTTIE=1 \
modules/skottie/utils/SkottieUtils.cpp"
if [[ $@ == *no_managed_skottie* || $@ == *no_skottie* ]]; then
echo "Omitting managed Skottie"
ENABLED_MANAGED_SKOTTIE="false"
MANAGED_SKOTTIE_BINDINGS="-DSK_INCLUDE_MANAGED_SKOTTIE=0"
fi
ENABLE_PARTICLES="true"
PARTICLES_JS="--pre-js $BASE_DIR/particles.js"
PARTICLES_BINDINGS="$BASE_DIR/particles_bindings.cpp"
PARTICLES_LIB="$BUILD_DIR/libparticles.a"
if [[ $@ == *no_particles* ]]; then
echo "Omitting Particles"
ENABLE_PARTICLES="false"
PARTICLES_JS=""
PARTICLES_BINDINGS=""
PARTICLES_LIB=""
fi
ENABLE_PATHOPS="true"
if [[ $@ != *no_particles* || $@ != *no_skottie* ]] ; then
PARTICLES_BINDINGS+=" modules/skresources/src/SkResources.cpp"
fi
WASM_PATHOPS="-DSK_INCLUDE_PATHOPS"
PATHOPS_JS="--pre-js $BASE_DIR/pathops.js"
if [[ $@ == *no_pathops* ]] ; then
# This saves about 2kb compressed.
echo "Omitting PathOps"
ENABLE_PATHOPS="false"
WASM_PATHOPS=""
PATHOPS_JS=""
fi
ENABLE_RT_SHADER="true"
WASM_RT_SHADER="-DSK_INCLUDE_RUNTIME_EFFECT"
RT_SHADER_JS="--pre-js $BASE_DIR/rt_shader.js"
if [[ $@ == *no_rt_shader* ]] ; then
echo "Omitting runtime shaders"
ENABLE_RT_SHADER="false"
WASM_RT_SHADER=""
RT_SHADER_JS=""
fi
ENABLE_SKSL_TRACE="true"
WASM_SKSL_TRACE="-DSK_INCLUDE_SKSL_TRACE"
if [[ $@ == *no_sksl_trace* ]] ; then
echo "Omitting SkSl trace"
ENABLE_SKSL_TRACE="false"
WASM_SKSL_TRACE=""
fi
ENABLE_MATRIX="true"
MATRIX_HELPER_JS="--pre-js $BASE_DIR/matrix.js"
if [[ $@ == *no_matrix* ]]; then
echo "Omitting matrix helper code"
ENABLE_MATRIX="false"
MATRIX_HELPER_JS=""
fi
ENABLE_CANVAS="true"
HTML_CANVAS_API="--pre-js $BASE_DIR/htmlcanvas/preamble.js \
--pre-js $BASE_DIR/htmlcanvas/util.js \
--pre-js $BASE_DIR/htmlcanvas/color.js \
--pre-js $BASE_DIR/htmlcanvas/font.js \
--pre-js $BASE_DIR/htmlcanvas/canvas2dcontext.js \
--pre-js $BASE_DIR/htmlcanvas/htmlcanvas.js \
--pre-js $BASE_DIR/htmlcanvas/htmlimage.js \
--pre-js $BASE_DIR/htmlcanvas/imagedata.js \
--pre-js $BASE_DIR/htmlcanvas/lineargradient.js \
--pre-js $BASE_DIR/htmlcanvas/path2d.js \
--pre-js $BASE_DIR/htmlcanvas/pattern.js \
--pre-js $BASE_DIR/htmlcanvas/radialgradient.js \
--pre-js $BASE_DIR/htmlcanvas/postamble.js "
if [[ $@ == *no_canvas* || $@ == *no_matrix* ]]; then
# Note: HTML Canvas bindings depend on the matrix helpers.
echo "Omitting bindings for HTML Canvas API"
ENABLE_CANVAS="false"
HTML_CANVAS_API=""
fi
GN_FONT="skia_enable_fontmgr_custom_directory=false "
WOFF2_FONT="skia_use_freetype_woff2=true"
ENABLE_FONT="true"
ENABLE_EMBEDDED_FONT="true"
FONT_CFLAGS=""
BUILTIN_FONT=""
FONT_JS="--pre-js $BASE_DIR/font.js"
if [[ $@ == *no_font* ]]; then
echo "Omitting the built-in font(s), font manager and all code dealing with fonts"
ENABLE_FONT="false"
ENABLE_EMBEDDED_FONT="false"
FONT_CFLAGS="-DSK_NO_FONTS"
WOFF2_FONT=""
FONT_JS=""
GN_FONT+="skia_enable_fontmgr_custom_embedded=false skia_enable_fontmgr_custom_empty=false"
elif [[ $@ == *no_embedded_font* ]]; then
echo "Omitting the built-in font(s)"
ENABLE_EMBEDDED_FONT="false"
GN_FONT+="skia_enable_fontmgr_custom_embedded=false skia_enable_fontmgr_custom_empty=true"
else
# Generate the font's binary file (which is covered by .gitignore)
python tools/embed_resources.py \
--name SK_EMBEDDED_FONTS \
--input $BASE_DIR/fonts/NotoMono-Regular.ttf \
--output $BASE_DIR/fonts/NotoMono-Regular.ttf.cpp \
--align 4
BUILTIN_FONT="$BASE_DIR/fonts/NotoMono-Regular.ttf.cpp"
GN_FONT+="skia_enable_fontmgr_custom_embedded=true skia_enable_fontmgr_custom_empty=false"
fi
@ -159,21 +212,32 @@ if [[ $@ == *no_woff2* ]]; then
WOFF2_FONT="skia_use_freetype_woff2=false"
fi
ENABLE_ALIAS_FONT="true"
if [[ $@ == *no_alias_font* ]]; then
ENABLE_ALIAS_FONT="false"
EXTRA_CFLAGS+="\"-DCANVASKIT_NO_ALIAS_FONT\","
FONT_CFLAGS+=" -DCANVASKIT_NO_ALIAS_FONT"
fi
GN_SHAPER="skia_use_icu=true skia_use_system_icu=false skia_use_harfbuzz=true skia_use_system_harfbuzz=false"
SHAPER_LIB="$BUILD_DIR/libskunicode.a \
$BUILD_DIR/libharfbuzz.a \
$BUILD_DIR/libicu.a"
if [[ $@ == *primitive_shaper* ]] || [[ $@ == *no_font* ]]; then
echo "Using the primitive shaper instead of the harfbuzz/icu one"
GN_SHAPER="skia_use_icu=false skia_use_harfbuzz=false"
SHAPER_LIB=""
fi
ENABLE_PARAGRAPH="true"
PARAGRAPH_JS="--pre-js $BASE_DIR/paragraph.js"
PARAGRAPH_LIB="$BUILD_DIR/libskparagraph.a"
PARAGRAPH_BINDINGS="-DSK_INCLUDE_PARAGRAPH=1 \
$BASE_DIR/paragraph_bindings.cpp \
$BASE_DIR/paragraph_bindings_gen.cpp"
if [[ $@ == *no_paragraph* ]] || [[ $@ == *primitive_shaper* ]] || [[ $@ == *no_font* ]]; then
echo "Omitting paragraph (must have fonts and non-primitive shaper)"
ENABLE_PARAGRAPH="false"
PARAGRAPH_JS=""
PARAGRAPH_LIB=""
PARAGRAPH_BINDINGS=""
fi
DO_DECODE="true"
@ -214,12 +278,21 @@ set -e
./bin/fetch-gn
echo "Compiling"
echo "Compiling bitcode"
# Inspired by https://github.com/Zubnix/skia-wasm-port/blob/master/build_bindings.sh
./bin/gn gen ${BUILD_DIR} \
--args="emsdk_dir=\"${EMSDK}\" \
is_debug=${IS_DEBUG} \
--args="cc=\"${EMCC}\" \
cxx=\"${EMCXX}\" \
ar=\"${EMAR}\" \
extra_cflags=[\"-s\", \"MAIN_MODULE=1\",
\"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",
\"-DSK_FORCE_8_BYTE_ALIGNMENT\",
${GN_GPU_FLAGS}
${GN_SKP_FLAGS}
${EXTRA_CFLAGS}
] \
is_debug=false \
is_official_build=${IS_OFFICIAL_BUILD} \
is_component_build=false \
werror=true \
@ -228,7 +301,6 @@ echo "Compiling"
skia_use_angle=false \
skia_use_dng_sdk=false \
skia_use_webgl=true \
skia_use_expat=${USE_EXPAT} \
skia_use_fontconfig=false \
skia_use_freetype=true \
skia_use_libheif=false \
@ -248,32 +320,91 @@ echo "Compiling"
skia_use_vulkan=false \
skia_use_wuffs=true \
skia_use_zlib=true \
skia_use_gpu=${ENABLE_GPU} \
\
${GN_SHAPER} \
${GN_GPU} \
${GN_FONT} \
${WOFF2_FONT} \
${GN_VIEWER} \
\
skia_enable_skshaper=true \
skia_enable_skparagraph=true \
skia_enable_pdf=false \
skia_canvaskit_force_tracing=${FORCE_TRACING} \
skia_canvaskit_enable_profile_build=${PROFILE_BUILD} \
skia_canvaskit_enable_experimental_simd=${BUILD_WITH_SIMD} \
skia_canvaskit_enable_skp_serialization=${SERIALIZE_SKP} \
skia_canvaskit_enable_effects_deserialization=${DESERIALIZE_EFFECTS} \
skia_canvaskit_enable_skottie=${ENABLE_SKOTTIE} \
skia_canvaskit_include_viewer=${INCLUDE_VIEWER} \
skia_canvaskit_enable_managed_skottie=${ENABLE_MANAGED_SKOTTIE} \
skia_canvaskit_enable_particles=${ENABLE_PARTICLES} \
skia_canvaskit_enable_pathops=${ENABLE_PATHOPS} \
skia_canvaskit_enable_rt_shader=${ENABLE_RT_SHADER} \
skia_canvaskit_enable_sksl_trace=${ENABLE_SKSL_TRACE} \
skia_canvaskit_enable_matrix_helper=${ENABLE_MATRIX} \
skia_canvaskit_enable_canvas_bindings=${ENABLE_CANVAS} \
skia_canvaskit_enable_font=${ENABLE_FONT} \
skia_canvaskit_enable_embedded_font=${ENABLE_EMBEDDED_FONT} \
skia_canvaskit_enable_alias_font=${ENABLE_ALIAS_FONT} \
skia_canvaskit_enable_paragraph=${ENABLE_PARAGRAPH}"
skia_enable_pdf=false"
${NINJA} -v -C ${BUILD_DIR} canvaskit.js
# Build all the libs we will need below
parse_targets() {
for LIBPATH in $@; do
basename $LIBPATH
done
}
${NINJA} -C ${BUILD_DIR} libskia.a libskshaper.a \
$(parse_targets $SKOTTIE_LIB $VIEWER_LIB $PARTICLES_LIB $SHAPER_LIB $PARAGRAPH_LIB)
export EMCC_CLOSURE_ARGS="--externs $BASE_DIR/externs.js "
echo "Generating final wasm"
# Emscripten prefers that the .a files go last in order, otherwise, it
# may drop symbols that it incorrectly thinks aren't used. One day,
# Emscripten will use LLD, which may relax this requirement.
EMCC_DEBUG=1 ${EMCXX} \
$RELEASE_CONF \
-I. \
-Ithird_party/icu \
-Ithird_party/skcms \
-Ithird_party/externals/icu/source/common/ \
-DSK_DISABLE_AAA \
-DSK_FORCE_8_BYTE_ALIGNMENT \
-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
-fno-rtti \
$WASM_GPU \
$WASM_PATHOPS \
$WASM_RT_SHADER \
$WASM_SKSL_TRACE \
$WASM_SKP \
$FONT_CFLAGS \
-std=c++17 \
--bind \
--no-entry \
--pre-js $BASE_DIR/preamble.js \
--pre-js $BASE_DIR/color.js \
--pre-js $BASE_DIR/memory.js \
--pre-js $BASE_DIR/util.js \
--pre-js $BASE_DIR/interface.js \
$MATRIX_HELPER_JS \
$PARAGRAPH_JS \
$SKOTTIE_JS \
$PARTICLES_JS \
$PATHOPS_JS \
$FONT_JS \
$SKP_JS \
$RT_SHADER_JS \
$HTML_CANVAS_API \
--pre-js $BASE_DIR/postamble.js \
$BASE_DIR/canvaskit_bindings.cpp \
$PARTICLES_BINDINGS \
$SKOTTIE_BINDINGS \
$VIEWER_BINDINGS \
$MANAGED_SKOTTIE_BINDINGS \
$PARAGRAPH_BINDINGS \
$SKOTTIE_LIB \
$VIEWER_LIB \
$PARTICLES_LIB \
$PARAGRAPH_LIB \
$BUILD_DIR/libskshaper.a \
$SHAPER_LIB \
$BUILD_DIR/libskia.a \
$BUILTIN_FONT \
-sLLD_REPORT_UNDEFINED \
-sALLOW_MEMORY_GROWTH=1 \
-sEXPORT_NAME="CanvasKitInit" \
-sEXPORTED_FUNCTIONS=['_malloc','_free'] \
-sFORCE_FILESYSTEM=0 \
-sFILESYSTEM=0 \
-sMODULARIZE=1 \
-sNO_EXIT_RUNTIME=1 \
-sDYNAMIC_EXECUTION=0 \
-sINITIAL_MEMORY=128MB \
-sWASM=1 \
-sSTRICT=1 \
-o $BUILD_DIR/canvaskit.js

6
modules/canvaskit/compile_gm.sh
View File

@ -21,7 +21,9 @@ fi
pushd $BASE_DIR/../..
source $EMSDK/emsdk_env.sh
EMCC=`which emcc`
EMCXX=`which em++`
EMAR=`which emar`
if [[ $@ == *debug* ]]; then
echo "Building a Debug build"
@ -83,7 +85,9 @@ echo "Compiling bitcode"
# Inspired by https://github.com/Zubnix/skia-wasm-port/blob/master/build_bindings.sh
./bin/gn gen ${BUILD_DIR} \
--args="emsdk_dir=\"${EMSDK}\" \
--args="cc=\"${EMCC}\" \
cxx=\"${EMCXX}\" \
ar=\"${EMAR}\" \
extra_cflags_cc=[\"-frtti\"] \
extra_cflags=[\"-sMAIN_MODULE=1\",
\"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",

6
modules/pathkit/compile.sh
View File

@ -72,7 +72,9 @@ fi
OUTPUT="-o $BUILD_DIR/pathkit.js"
source $EMSDK/emsdk_env.sh
EMCC=`which emcc`
EMCXX=`which em++`
EMAR=`which emar`
# Turn off exiting while we check for ninja (which may not be on PATH)
set +e
@ -88,7 +90,9 @@ echo "Compiling bitcode"
./bin/fetch-gn
./bin/gn gen ${BUILD_DIR} \
--args="emsdk_dir=\"${EMSDK}\" \
--args="cc=\"${EMCC}\" \
cxx=\"${EMCXX}\" \
ar=\"${EMAR}\" \
extra_cflags=[
\"-sMAIN_MODULE=1\",
${EXTRA_CFLAGS}

5
third_party/freetype2/BUILD.gn vendored
View File

@ -6,9 +6,8 @@
declare_args() {
# TODO: build from source all the time for testing?
skia_use_system_freetype2 =
(is_official_build || !(is_android || sanitize == "MSAN")) &&
!is_fuchsia && !is_wasm
skia_use_freetype_woff2 = is_wasm
(is_official_build || !(is_android || sanitize == "MSAN")) && !is_fuchsia
skia_use_freetype_woff2 = false
}
import("../third_party.gni")

2
third_party/harfbuzz/BUILD.gn vendored
View File

@ -7,7 +7,7 @@ import("../../gn/skia.gni")
import("../third_party.gni")
declare_args() {
skia_use_system_harfbuzz = is_official_build && !is_wasm
skia_use_system_harfbuzz = is_official_build
}
if (skia_use_system_harfbuzz) {

2
third_party/icu/BUILD.gn vendored
View File

@ -8,7 +8,7 @@ import("../third_party.gni")
import("icu.gni")
declare_args() {
skia_use_system_icu = is_official_build && !is_wasm
skia_use_system_icu = is_official_build
}
if (skia_use_system_icu) {

2
third_party/libjpeg-turbo/BUILD.gn vendored
View File

@ -4,7 +4,7 @@
# found in the LICENSE file.
declare_args() {
skia_use_system_libjpeg_turbo = is_official_build && !is_wasm
skia_use_system_libjpeg_turbo = is_official_build
}
import("../third_party.gni")

2
third_party/libpng/BUILD.gn vendored
View File

@ -4,7 +4,7 @@
# found in the LICENSE file.
declare_args() {
skia_use_system_libpng = is_official_build && !is_wasm
skia_use_system_libpng = is_official_build
}
import("../third_party.gni")

2
third_party/libwebp/BUILD.gn vendored
View File

@ -4,7 +4,7 @@
# found in the LICENSE file.
declare_args() {
skia_use_system_libwebp = is_official_build && !is_wasm
skia_use_system_libwebp = is_official_build
}
import("../third_party.gni")

5
tools/git-sync-deps
View File

@ -141,7 +141,7 @@ def git_checkout_to_directory(git, repo, commithash, directory, verbose):
if not is_git_toplevel(git, directory):
# if the directory exists, but isn't a git repo, you will modify
# the parent repository, which isn't what you want.
# the parent repostory, which isn't what you want.
sys.stdout.write('%s\n IS NOT TOP-LEVEL GIT DIRECTORY.\n' % directory)
return
@ -262,9 +262,6 @@ def main(argv):
subprocess.check_call(
[sys.executable,
os.path.join(os.path.dirname(deps_file_path), 'bin', 'fetch-gn')])
subprocess.check_call(
[sys.executable,
os.path.join(os.path.dirname(deps_file_path), 'bin', 'activate-emsdk')])
return 0