commit b6f53783337e096d6803ba3907044b79b4ac9f6c
author Hal Canary <halcanary@google.com> Wed Feb 13 10:29:50 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 13 16:19:48 2019 +0000
tree c774367d374586ff20cb2c833316c8c8bf288fc7
parent ff1c49258f737bc29f3ebdb27cf94c5243a1226a

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 <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 9372a9b..b194f2f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1565,6 +1565,10 @@
     public_deps = [
       ":gpu_tool_utils",
     ]
+    if (skia_enable_skshaper) {
+      deps += [ "modules/skshaper" ]
+      defines = [ "SK_USING_SKSHAPER" ]
+    }
   }
 
   import("gn/tests.gni")
@@ -1590,6 +1594,10 @@
     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

diff --git a/gn/skia.gni b/gn/skia.gni
index 1834ab9..51462e3 100644
--- a/gn/skia.gni
+++ b/gn/skia.gni
@@ -4,4 +4,5 @@
 
 declare_args() {
   skia_use_icu = !is_fuchsia && !is_ios
+  skia_enable_skshaper = true
 }

modules/skshaper/BUILD.gn

diff --git a/modules/skshaper/BUILD.gn b/modules/skshaper/BUILD.gn
index 3452110..bd3e7cd 100644
--- a/modules/skshaper/BUILD.gn
+++ b/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") {