commit 53965c9d68d870d1e8183e20b59974937c52dfe1
author Kevin Lubick <kjlubick@google.com> Thu Oct 11 08:51:55 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 11 13:30:27 2018 +0000
tree c4753025ba5e22ad8d09b653f17f29e5eb9d6976
parent 9c37cd96e4c8158643dbde6fd3eda1b42e267bec

Add CPU backend for CanvasKit

This also makes the GPU and Skottie portions optional
at build time.

Bug: skia:
Change-Id: I34f494caf0e2ca35dc4767d57f79ba92b24e818f
Reviewed-on: https://skia-review.googlesource.com/c/159146
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

experimental/canvaskit/compile.sh

diff --git a/experimental/canvaskit/compile.sh b/experimental/canvaskit/compile.sh
index ff225ed..0fc2a8f 100755
--- a/experimental/canvaskit/compile.sh
+++ b/experimental/canvaskit/compile.sh
@@ -30,6 +30,37 @@
   RELEASE_CONF="-O0 --js-opts 0 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 -g3 -DPATHKIT_TESTING -DSK_DEBUG"
 fi
 
+GN_GPU="skia_enable_gpu=true"
+WASM_GPU="-lEGL -lGLESv2 -DSK_SUPPORT_GPU=1"
+if [[ $@ == *no_gpu* ]]; then
+  echo "Omitting the GPU backend"
+  GN_GPU="skia_enable_gpu=false"
+  WASM_GPU="-DSK_SUPPORT_GPU=0"
+fi
+
+WASM_SKOTTIE="-DSK_INCLUDE_SKOTTIE=1 \
+  modules/skottie/src/Skottie.cpp \
+  modules/skottie/src/SkottieAdapter.cpp \
+  modules/skottie/src/SkottieAnimator.cpp \
+  modules/skottie/src/SkottieJson.cpp \
+  modules/skottie/src/SkottieLayer.cpp \
+  modules/skottie/src/SkottieLayerEffect.cpp \
+  modules/skottie/src/SkottiePrecompLayer.cpp \
+  modules/skottie/src/SkottieProperty.cpp \
+  modules/skottie/src/SkottieShapeLayer.cpp \
+  modules/skottie/src/SkottieTextLayer.cpp \
+  modules/skottie/src/SkottieValue.cpp \
+  modules/sksg/src/*.cpp \
+  src/core/SkCubicMap.cpp \
+  src/core/SkTime.cpp \
+  src/pathops/SkOpBuilder.cpp \
+  src/utils/SkJSON.cpp \
+  src/utils/SkParse.cpp "
+if [[ $@ == *no_skottie* ]]; then
+  echo "Omitting Skottie"
+  WASM_SKOTTIE="-DSK_INCLUDE_SKOTTIE=0"
+fi
+
 # Turn off exiting while we check for ninja (which may not be on PATH)
 set +e
 NINJA=`which ninja`
@@ -73,7 +104,7 @@
   skia_use_zlib=true \
   \
   skia_enable_ccpr=false \
-  skia_enable_gpu=true \
+  ${GN_GPU} \
   skia_enable_fontmgr_empty=false \
   skia_enable_pdf=false"
 
@@ -104,33 +135,16 @@
     -Isrc/sfnt/ \
     -Itools/fonts \
     -Itools \
-    -lEGL \
-    -lGLESv2 \
+    $WASM_GPU \
     -std=c++14 \
     --bind \
     --pre-js $BASE_DIR/helper.js \
     --pre-js $BASE_DIR/interface.js \
     $BASE_DIR/canvaskit_bindings.cpp \
     $BUILD_DIR/libskia.a \
-    modules/skottie/src/Skottie.cpp \
-    modules/skottie/src/SkottieAdapter.cpp \
-    modules/skottie/src/SkottieAnimator.cpp \
-    modules/skottie/src/SkottieJson.cpp \
-    modules/skottie/src/SkottieLayer.cpp \
-    modules/skottie/src/SkottieLayerEffect.cpp \
-    modules/skottie/src/SkottiePrecompLayer.cpp \
-    modules/skottie/src/SkottieProperty.cpp \
-    modules/skottie/src/SkottieShapeLayer.cpp \
-    modules/skottie/src/SkottieTextLayer.cpp \
-    modules/skottie/src/SkottieValue.cpp \
-    modules/sksg/src/*.cpp \
-    src/core/SkCubicMap.cpp \
-    src/core/SkTime.cpp \
-    src/pathops/SkOpBuilder.cpp \
     tools/fonts/SkTestFontMgr.cpp \
     tools/fonts/SkTestTypeface.cpp \
-    src/utils/SkJSON.cpp \
-    src/utils/SkParse.cpp \
+    $WASM_SKOTTIE \
     -s ALLOW_MEMORY_GROWTH=1 \
     -s EXPORT_NAME="CanvasKitInit" \
     -s FORCE_FILESYSTEM=0 \