[canvaskit] Speculative fix for external wasm library

See https://groups.google.com/forum/#!topic/skia-discuss/J2XT7XjmFtI

Change-Id: I4daabc160e9f5b09d4233bcaf24661c8473c0d07
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246080
Reviewed-by: Ben Wagner <bungeman@google.com>

modules/canvaskit/compile.sh

@@ -171,7 +171,7 @@ echo "Compiling bitcode"
   target_cpu=\"wasm\" \
   use_PIC=false \
   \
-  skia_use_angle = false \
+  skia_use_angle=false \
   skia_use_dng_sdk=false \
   skia_use_egl=true \
   skia_use_expat=false \
@@ -232,7 +232,6 @@ ${EMCXX} \
     $HTML_CANVAS_API \
     --pre-js $BASE_DIR/postamble.js \
     --post-js $BASE_DIR/ready.js \
-    $BUILTIN_FONT \
     $BASE_DIR/canvaskit_bindings.cpp \
     $PARTICLES_BINDINGS \
     $SKOTTIE_BINDINGS \
@@ -244,6 +243,7 @@ ${EMCXX} \
     $BUILD_DIR/libskshaper.a \
     $SHAPER_LIB \
     $BUILD_DIR/libskia.a \
+    $BUILTIN_FONT \
     -s ALLOW_MEMORY_GROWTH=1 \
     -s EXPORT_NAME="CanvasKitInit" \
     -s FORCE_FILESYSTEM=0 \

modules/canvaskit/fonts/nofonts.cpp

@@ -4,7 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "include/core/SkTypes.h"
+#include <stddef.h>
+#include <stdint.h>
 struct SkEmbeddedResource { const uint8_t* d; const size_t s; };
 static const SkEmbeddedResource header[] = {};
 static const int header_count = 0;

tools/embed_resources.py

@@ -39,7 +39,8 @@ extern "C" SkEmbeddedHeader const NAME;''')
   args = parser.parse_args()
 
   out = args.output.write;
-  out('#include "include/core/SkTypes.h"\n')
+  out('#include <stddef.h>\n')
+  out('#include <stdint.h>\n')
 
   # Write the resources.
   index = 0