SkShaper: enable for unit and render tests

New tests that use skshaper should hide behind SK_USING_SKSHAPER define.

Change-Id: Ifcd726d931e3eb1ff209085a63e8129c9cd5596d
Reviewed-on: https://skia-review.googlesource.com/c/192026
Reviewed-by: Hal Canary <[email protected]>
Commit-Queue: Hal Canary <[email protected]>

Author: HalCanary

BUILD.gn

@@ -1565,6 +1565,10 @@ if (skia_enable_tools) {
     public_deps = [
       ":gpu_tool_utils",
     ]
+    if (skia_enable_skshaper) {
+      deps += [ "modules/skshaper" ]
+      defines = [ "SK_USING_SKSHAPER" ]
+    }
   }
 
   import("gn/tests.gni")
@@ -1590,6 +1594,10 @@ if (skia_enable_tools) {
     public_deps = [
       ":gpu_tool_utils",  # Test.h #includes headers from this target.
     ]
+    if (skia_enable_skshaper) {
+      deps += [ "modules/skshaper" ]
+      defines = [ "SK_USING_SKSHAPER" ]
+    }
   }
 
   import("gn/bench.gni")

gn/skia.gni

@@ -4,4 +4,5 @@
 
 declare_args() {
   skia_use_icu = !is_fuchsia && !is_ios
+  skia_enable_skshaper = true
 }

modules/skshaper/BUILD.gn

@@ -3,10 +3,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-declare_args() {
-  skia_enable_skshaper = true
-}
-
 import("../../gn/skia.gni")
 
 config("public_config") {