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

Build tools on NoGPU bots.

Browse Source 
I was just lazy disabling this before.  It turns out to not be difficult.

This gets us slightly better testing out of the NoGPU bot, as we now know
not only that Skia compiles, but also that DM and nanobench can link (and
thus that Skia's got enough compiled in it to be a coherent library).

skpbench requires GPU support.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2356283002

Review-Url: https://codereview.chromium.org/2356283002
This commit is contained in:
mtklein 2016-09-21 10:11:25 -07:00 committed by Commit bot
parent 04a44d0fd4
commit 38925aa37c
1 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BUILD.gn
View File

@ -28,8 +28,8 @@ declare_args() {
skia_enable_vulkan_debug_layers = is_skia_standalone && is_debug skia_enable_vulkan_debug_layers = is_skia_standalone && is_debug
} }
# Our tools require static linking (they use non-exported symbols) and GPU support (just lazy). # Our tools require static linking (they use non-exported symbols).
skia_enable_tools = skia_enable_tools && skia_enable_gpu && !is_component_build skia_enable_tools = skia_enable_tools && !is_component_build
fontmgr_android_enabled = skia_use_expat && skia_use_freetype fontmgr_android_enabled = skia_use_expat && skia_use_freetype
@ -625,8 +625,10 @@ if (skia_enable_tools) {
} }
test_lib("gpu_tool_utils") { test_lib("gpu_tool_utils") {
public_include_dirs = []
if (skia_enable_gpu) {
public_defines = [] public_defines = []
public_include_dirs = [ "tools/gpu" ] public_include_dirs += [ "tools/gpu" ]
sources = [ sources = [
"tools/gpu/GrContextFactory.cpp", "tools/gpu/GrContextFactory.cpp",
"tools/gpu/GrTest.cpp", "tools/gpu/GrTest.cpp",
@ -660,6 +662,7 @@ if (skia_enable_tools) {
libs += [ "OSMesa" ] libs += [ "OSMesa" ]
} }
} }
}
test_lib("flags") { test_lib("flags") {
public_include_dirs = [ "tools/flags" ] public_include_dirs = [ "tools/flags" ]
@ -864,6 +867,7 @@ if (skia_enable_tools) {
testonly = true testonly = true
} }
if (skia_enable_gpu) {
executable("skpbench") { executable("skpbench") {
sources = [ sources = [
"tools/skpbench/skpbench.cpp", "tools/skpbench/skpbench.cpp",
@ -876,6 +880,7 @@ if (skia_enable_tools) {
] ]
testonly = true testonly = true
} }
}
if (current_cpu != "mipsel") { # Clang 3.8 crashes while compiling hb-icu.cc for mipsel. if (current_cpu != "mipsel") { # Clang 3.8 crashes while compiling hb-icu.cc for mipsel.
executable("sktexttopdf-hb") { executable("sktexttopdf-hb") {