[canvaskit] Fix primitive_shaper build
The problem was we didn't have a way to not build with SkParagraph, which we can't use when we are using the primitive shaper. Change-Id: Iafe070d6f5c01aaa7a42225793d5ad873f144798 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254968 Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
parent
a657b0c590
commit
541f310b34
@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
### Fixed
|
||||
- null dereference when sometimes falling back to CPU.
|
||||
- Actually ask WebGL for a stencil buffer.
|
||||
- Can opt out of Paragraph API with no_paragraph passed into compile.sh or when using primitive_shaper.
|
||||
|
||||
## [0.8.0] - 2019-10-21
|
||||
|
||||
|
@ -143,6 +143,14 @@ PARAGRAPH_LIB="$BUILD_DIR/libskparagraph.a"
|
||||
PARAGRAPH_BINDINGS="-DSK_INCLUDE_PARAGRAPH=1 \
|
||||
$BASE_DIR/paragraph_bindings.cpp"
|
||||
|
||||
if [[ $@ == *no_paragraph* ]] || [[ $@ == *primitive_shaper* ]]; then
|
||||
echo "Omitting paragraph (must also have non-primitive shaper)"
|
||||
PARAGRAPH_JS=""
|
||||
PARAGRAPH_LIB=""
|
||||
PARAGRAPH_BINDINGS=""
|
||||
fi
|
||||
|
||||
|
||||
# Turn off exiting while we check for ninja (which may not be on PATH)
|
||||
set +e
|
||||
NINJA=`which ninja`
|
||||
|
Loading…
Reference in New Issue
Block a user