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

When compiling SwiftShader, set BUILD_TESTS=OFF.

Browse Source 
After https://swiftshader-review.googlesource.com/c/SwiftShader/+/19228,
SwiftShader fails to build without third_party/googletest unless
BUILD_TESTS is disabled.

Bug: skia:8054
Change-Id: If365fbbfc42dd3c41cc57be0fd7d494e7f83589d
Reviewed-on: https://skia-review.googlesource.com/133832
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-06-11 12:19:40 -04:00 committed by Skia Commit-Bot
parent 79aea6a147
commit 57f8fcd422
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/build/default.py
View File

@ -35,7 +35,7 @@ def compile_swiftshader(api, swiftshader_root, cc, cxx, out):
api.file.ensure_directory('makedirs swiftshader_out', out)
with api.context(cwd=out, env=env):
api.run(api.step, 'swiftshader cmake',
cmd=['cmake', swiftshader_root, '-GNinja'])
cmd=['cmake', '-DBUILD_TESTS=OFF', swiftshader_root, '-GNinja'])
api.run(api.step, 'swiftshader ninja',
cmd=['ninja', '-C', out, 'libEGL.so', 'libGLESv2.so'])

1
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
View File

@ -31,6 +31,7 @@
{
"cmd": [
"cmake",
"-DBUILD_TESTS=OFF",
"[START_DIR]/cache/work/skia/third_party/externals/swiftshader",
"-GNinja"
],