commit 63559a570c1a2ccc071422d5d3ce5f2a69b05dc3
author Mike Reed <reed@google.com> Tue Jun 02 11:34:24 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 02 19:26:04 2020 +0000
tree 2fcc104def1f274dd5a70d20af8fe240c2e712fa
parent 77a233283c2114cc29fbb786cad7649ea84705bc

Revert "Revert "gms for SkParagraph""

This reverts commit e37d578796f2111e1f5e206930bb4852d0d5f032.

Change-Id: I7d979657d34e981998cd7c3ef3e05fd59e2721ab
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293350
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 1465e8e..b0d9425 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1147,11 +1147,9 @@
   deps = [
     "modules/particles",
     "modules/skottie",
+    "modules/skparagraph",
     "modules/skshaper",
   ]
-  if (target_cpu == "wasm") {
-    deps += [ "modules/skparagraph" ]
-  }
 }
 
 # Targets guarded by skia_enable_tools may use //third_party freely.
@@ -1534,6 +1532,8 @@
       ":tool_utils",
       "modules/skottie",
       "modules/skottie:gm",
+      "modules/skparagraph",
+      "modules/skparagraph:gm",
       "modules/skshaper",
     ]
     if (is_skia_dev_build) {
@@ -1817,7 +1817,7 @@
       ":skia",
       ":tool_utils",
       ":trace",
-      "modules/skparagraph:bench",
+      "modules/skparagraph",
       "modules/skshaper",
     ]
   }