use SkShaper instead of SkTextBox

Change-Id: I63fae79007938cb89c122799b8984a88e91ac1e7
Reviewed-on: https://skia-review.googlesource.com/102863
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

1 files changed, 14 insertions, 7 deletions

diff --git a/BUILD.gn b/BUILD.gn
index b214a25546..aef276c48a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1499,6 +1499,7 @@ if (skia_enable_tools) {
         ":experimental_svg_model",
         ":flags",
         ":gm",
+        ":skshaper",
         ":tool_utils",
         ":views",
         ":xml",
@@ -1609,15 +1610,21 @@ if (skia_enable_tools) {
     }
   }
 
-  # TODO(halcanary): Build ICU on iOS.
-  if (!is_ios && target_cpu != "wasm") {
-    test_app("sktexttopdf-hb") {
+  test_lib("skshaper") {
+    public_include_dirs = [ "tools/shape" ]
+    deps = [
+      ":skia",
+    ]
+    # TODO(halcanary): Build ICU on iOS.
+    if (is_ios || target_cpu == "wasm") {
+      sources = [
+        "tools/shape/SkShaper_primitive.cpp",
+      ]
+    } else {
       sources = [
         "tools/shape/SkShaper_harfbuzz.cpp",
-        "tools/shape/using_skia_and_harfbuzz.cpp",
       ]
-      deps = [
-        ":skia",
+      deps += [
         "//third_party/harfbuzz",
         "//third_party/icu",
       ]
@@ -1625,11 +1632,11 @@ if (skia_enable_tools) {
   }
   test_app("sktexttopdf") {
     sources = [
-      "tools/shape/SkShaper_primitive.cpp",
       "tools/shape/using_skia_and_harfbuzz.cpp",
     ]
     deps = [
       ":skia",
+      ":skshaper",
     ]
   }