[WASM] Add POC compile bot for WebAssembly
Fix core.gni to use not use Assembler for none cpu.
Right now, there are no outputs because we aren't compiling
dm or nanobench. However, this still compiles the skia
library and creates two executables, so it's a good canary
for a real WASM build.
Additional note: the two executables in question don't draw
anything to the screen via GL, which is still not possible with
Skia+WASM.
Bug: skia:
Change-Id: I0d767467e94e40d01070e34223dd90e96f1c96f2
Reviewed-on: https://skia-review.googlesource.com/49540
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index bf57a64..ece39b0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1190,51 +1190,53 @@
]
}
- test_lib("views") {
- public_include_dirs = [ "include/views" ]
- sources = [
- "src/views/SkEvent.cpp",
- "src/views/SkEventSink.cpp",
- "src/views/SkOSMenu.cpp",
- "src/views/SkTagList.cpp",
- "src/views/SkTouchGesture.cpp",
- "src/views/SkView.cpp",
- "src/views/SkViewPriv.cpp",
- ]
- libs = []
- deps = []
- if (!is_android) {
- sources += [ "src/views/SkWindow.cpp" ]
- }
- if (is_linux) {
- public_include_dirs += [ "src/views/unix" ]
- sources += [
- "src/views/unix/SkOSWindow_Unix.cpp",
- "src/views/unix/keysym2ucs.c",
+ if (target_cpu != "wasm") {
+ test_lib("views") {
+ public_include_dirs = [ "include/views" ]
+ sources = [
+ "src/views/SkEvent.cpp",
+ "src/views/SkEventSink.cpp",
+ "src/views/SkOSMenu.cpp",
+ "src/views/SkTagList.cpp",
+ "src/views/SkTouchGesture.cpp",
+ "src/views/SkView.cpp",
+ "src/views/SkViewPriv.cpp",
]
- libs += [
- "GL",
- "X11",
- ]
- } else if (is_mac) {
- sources += [
- "src/views/mac/SkEventNotifier.mm",
- "src/views/mac/SkNSView.mm",
- "src/views/mac/SkOSWindow_Mac.mm",
- "src/views/mac/SkTextFieldCell.m",
- ]
- libs += [
- "QuartzCore.framework",
- "Cocoa.framework",
- "Foundation.framework",
- ]
- } else if (is_win) {
- sources += [ "src/views/win/SkOSWindow_win.cpp" ]
- } else if (is_ios) {
- sources += [ "src/views/mac/SkEventNotifier.mm" ]
- }
- if (skia_use_angle) {
- deps += [ "//third_party/angle2" ]
+ libs = []
+ deps = []
+ if (!is_android) {
+ sources += [ "src/views/SkWindow.cpp" ]
+ }
+ if (is_linux) {
+ public_include_dirs += [ "src/views/unix" ]
+ sources += [
+ "src/views/unix/SkOSWindow_Unix.cpp",
+ "src/views/unix/keysym2ucs.c",
+ ]
+ libs += [
+ "GL",
+ "X11",
+ ]
+ } else if (is_mac) {
+ sources += [
+ "src/views/mac/SkEventNotifier.mm",
+ "src/views/mac/SkNSView.mm",
+ "src/views/mac/SkOSWindow_Mac.mm",
+ "src/views/mac/SkTextFieldCell.m",
+ ]
+ libs += [
+ "QuartzCore.framework",
+ "Cocoa.framework",
+ "Foundation.framework",
+ ]
+ } else if (is_win) {
+ sources += [ "src/views/win/SkOSWindow_win.cpp" ]
+ } else if (is_ios) {
+ sources += [ "src/views/mac/SkEventNotifier.mm" ]
+ }
+ if (skia_use_angle) {
+ deps += [ "//third_party/angle2" ]
+ }
}
}
@@ -1292,60 +1294,61 @@
]
}
- import("gn/samples.gni")
- test_lib("samples") {
- public_include_dirs = [ "samplecode" ]
- include_dirs = [ "experimental" ]
- sources = samples_sources + [
- "experimental/SkSetPoly3To3.cpp",
- "experimental/SkSetPoly3To3_A.cpp",
- "experimental/SkSetPoly3To3_D.cpp",
+ if (target_cpu != "wasm") {
+ import("gn/samples.gni")
+ test_lib("samples") {
+ public_include_dirs = [ "samplecode" ]
+ include_dirs = [ "experimental" ]
+ sources = samples_sources + [
+ "experimental/SkSetPoly3To3.cpp",
+ "experimental/SkSetPoly3To3_A.cpp",
+ "experimental/SkSetPoly3To3_D.cpp",
- # Relocating these files here, so that clients don't try to build them while they're
- # still in active development. Clang's thread safety analysis gets tripped up by
- # conditional locks.
- "src/core/SkThreadedBMPDevice.cpp",
- "src/core/SkThreadedBMPDevice.h",
- ]
- deps = [
- ":experimental_svg_model",
- ":flags",
- ":gm",
- ":tool_utils",
- ":views",
- ":xml",
- ]
+ # Relocating these files here, so that clients don't try to build them while they're
+ # still in active development. Clang's thread safety analysis gets tripped up by
+ # conditional locks.
+ "src/core/SkThreadedBMPDevice.cpp",
+ "src/core/SkThreadedBMPDevice.h",
+ ]
+ deps = [
+ ":experimental_svg_model",
+ ":flags",
+ ":gm",
+ ":tool_utils",
+ ":views",
+ ":xml",
+ ]
- if (skia_use_lua) {
- sources += [ "samplecode/SampleLua.cpp" ]
- deps += [
- ":lua",
- "//third_party/lua",
+ if (skia_use_lua) {
+ sources += [ "samplecode/SampleLua.cpp" ]
+ deps += [
+ ":lua",
+ "//third_party/lua",
+ ]
+ }
+ }
+ test_app("dm") {
+ sources = [
+ "dm/DM.cpp",
+ "dm/DMJsonWriter.cpp",
+ "dm/DMSrcSink.cpp",
+ ]
+ include_dirs = [ "tests" ]
+ deps = [
+ ":common_flags",
+ ":experimental_svg_model",
+ ":flags",
+ ":gm",
+ ":gpu_tool_utils",
+ ":skia",
+ ":tests",
+ ":tool_utils",
+ "//third_party/jsoncpp",
+ "//third_party/libpng",
]
}
}
- test_app("dm") {
- sources = [
- "dm/DM.cpp",
- "dm/DMJsonWriter.cpp",
- "dm/DMSrcSink.cpp",
- ]
- include_dirs = [ "tests" ]
- deps = [
- ":common_flags",
- ":experimental_svg_model",
- ":flags",
- ":gm",
- ":gpu_tool_utils",
- ":skia",
- ":tests",
- ":tool_utils",
- "//third_party/jsoncpp",
- "//third_party/libpng",
- ]
- }
-
test_app("ok") {
sources = [
"tools/ok.cpp",
@@ -1363,7 +1366,6 @@
":tool_utils",
]
}
-
test_app("nanobench") {
sources = [
"bench/nanobench.cpp",
@@ -1434,7 +1436,7 @@
}
# We can't yet build ICU on iOS or Windows.
- if (!is_ios && !is_win) {
+ if (!is_ios && !is_win && target_cpu != "wasm") {
test_app("sktexttopdf-hb") {
sources = [
"tools/shape/SkShaper_harfbuzz.cpp",
@@ -1502,7 +1504,7 @@
]
}
- if (!is_ios) {
+ if (!is_ios && target_cpu != "wasm") {
test_app("skiaserve") {
sources = [
"tools/skiaserve/Request.cpp",