commit 3d6d4160ee1994155a783408d63bd76af731f64f
author Nathaniel Nifong <nifong@google.com> Fri Sep 18 15:29:12 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 22 18:01:09 2020 +0000
tree 23e1b3f9b23e6b6ddc35c80e07710df778c7b861
parent 187b04b3577743ae5ad9fe8699181027d51624e1

Reland "include freetype in wasm build, see cl/332073924 for complete change"

This is a reland of 6cc032c12d99c18a0a544bc439f366686b5b8926

Original change's description:
> include freetype in wasm build, see cl/332073924 for complete change
>
> Change-Id: I2f1d6ef2719191fe9a56e31712c058c3207d23a9
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317615
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Nathaniel Nifong <nifong@google.com>

Change-Id: I7026b40885eb202fa8df1d2ba71e698818b84132
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318577
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Nathaniel Nifong <nifong@google.com>

public.bzl

diff --git a/public.bzl b/public.bzl
index 782adda..0120325 100644
--- a/public.bzl
+++ b/public.bzl
@@ -396,7 +396,7 @@
         # commented lines below left in because they indicate specifically what is
         # included here and not in other PORTS_SRCS lists.
         "src/ports/*FontConfig*",
-        "src/ports/*FreeType*",
+        #"src/ports/*FreeType*",
         "src/ports/*WIC*",
         "src/ports/*CG*",
         "src/ports/*android*",
@@ -408,11 +408,11 @@
         "src/ports/*win*",
         "src/ports/*NDK*",
         #"src/ports/SkDebug_stdio.cpp",
-        "src/ports/SkFontMgr_custom.cpp",
+        #"src/ports/SkFontMgr_custom.cpp",
         "src/ports/SkFontMgr_custom_directory.cpp",
         "src/ports/SkFontMgr_custom_directory_factory.cpp",
-        "src/ports/SkFontMgr_custom_embedded.cpp",
-        "src/ports/SkFontMgr_custom_embedded_factory.cpp",
+        #"src/ports/SkFontMgr_custom_embedded.cpp",
+        #"src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_custom_empty.cpp",
         "src/ports/SkFontMgr_custom_empty_factory.cpp",
         # "src/ports/SkFontMgr_empty_factory.cpp",