Add bidi to SkShaper.

Change-Id: Iaab9a1d5091a3b157a582b7e8c3261a6c3283ffc
Reviewed-on: https://skia-review.googlesource.com/40778
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 98bfdc5..0e4c071 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1389,19 +1389,20 @@
   if (!is_ios && !is_win) {
     test_app("sktexttopdf-hb") {
       sources = [
-        "tools/SkShaper_harfbuzz.cpp",
-        "tools/using_skia_and_harfbuzz.cpp",
+        "tools/shape/SkShaper_harfbuzz.cpp",
+        "tools/shape/using_skia_and_harfbuzz.cpp",
       ]
       deps = [
         ":skia",
         "//third_party/harfbuzz",
+        "//third_party/icu",
       ]
     }
   }
   test_app("sktexttopdf") {
     sources = [
-      "tools/SkShaper_primitive.cpp",
-      "tools/using_skia_and_harfbuzz.cpp",
+      "tools/shape/SkShaper_primitive.cpp",
+      "tools/shape/using_skia_and_harfbuzz.cpp",
     ]
     deps = [
       ":skia",