commit efcacfa8a86b258c51380588fc5170cb1fb9f6e5
author Yuqian Li <liyuqian@google.com> Fri Feb 09 03:38:20 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 09 03:38:31 2018 +0000
tree 044b96bcb4ba18ade0accd8e0b0d67e5be6d06a0
parent 18c46b553a3943337403b510be0a7dd75aacf35c

Revert "use SkShaper instead of SkTextBox"

This reverts commit 59dad9111792ca1ceebfb444497f81d9eb357b7d.

Reason for revert: Possibly breaks Build-Win-Clang-arm64-Release-Android

Original change's description:
> 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>

TBR=halcanary@google.com,bungeman@google.com,fmalita@chromium.org,reed@google.com

Change-Id: Id865d9e9cce03b4166f818c2bad659bdecc4f447
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/105941
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>

BUILD.gn

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