diff options
| -rw-r--r-- | BUILD.gn | 28 | ||||
| -rw-r--r-- | modules/skshaper/BUILD.gn | 40 | ||||
| -rw-r--r-- | modules/skshaper/include/SkShaper.h (renamed from tools/shape/SkShaper.h) | 0 | ||||
| -rw-r--r-- | modules/skshaper/src/SkShaper_harfbuzz.cpp (renamed from tools/shape/SkShaper_harfbuzz.cpp) | 0 | ||||
| -rw-r--r-- | modules/skshaper/src/SkShaper_primitive.cpp (renamed from tools/shape/SkShaper_primitive.cpp) | 0 | ||||
| -rw-r--r-- | third_party/harfbuzz/BUILD.gn | 1 | ||||
| -rw-r--r-- | tools/using_skia_and_harfbuzz.cpp (renamed from tools/shape/using_skia_and_harfbuzz.cpp) | 0 |
7 files changed, 44 insertions, 25 deletions
@@ -1474,7 +1474,7 @@ if (skia_enable_tools) { "src/utils/SkLuaCanvas.cpp", ] deps = [ - ":skshaper", + "modules/skshaper", "//third_party/lua", ] } @@ -1535,11 +1535,11 @@ if (skia_enable_tools) { ":experimental_svg_model", ":flags", ":gm", - ":skshaper", ":tool_utils", ":views", ":xml", "modules/sksg:samples", + "modules/skshaper", ] if (skia_use_lua) { @@ -1629,33 +1629,13 @@ if (skia_enable_tools) { } } - test_lib("skshaper") { - public_include_dirs = [ "tools/shape" ] - deps = [ - ":skia", - ] - - if (target_cpu == "wasm") { - sources = [ - "tools/shape/SkShaper_primitive.cpp", - ] - } else { - sources = [ - "tools/shape/SkShaper_harfbuzz.cpp", - ] - deps += [ - "//third_party/harfbuzz", - "//third_party/icu", - ] - } - } test_app("sktexttopdf") { sources = [ - "tools/shape/using_skia_and_harfbuzz.cpp", + "tools/using_skia_and_harfbuzz.cpp", ] deps = [ ":skia", - ":skshaper", + "modules/skshaper", ] } diff --git a/modules/skshaper/BUILD.gn b/modules/skshaper/BUILD.gn new file mode 100644 index 0000000000..eb67f90790 --- /dev/null +++ b/modules/skshaper/BUILD.gn @@ -0,0 +1,40 @@ +# Copyright 2018 Google Inc. +# +# 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 +} + +config("public_config") { + if (skia_enable_skshaper) { + include_dirs = [ "include" ] + } +} + +source_set("skshaper") { + if (skia_enable_skshaper) { + public_configs = [ ":public_config" ] + public = [ "include/SkShaper.h" ] + deps = [ + "../..:skia", + ] + if (target_cpu == "wasm") { + sources = [ + "src/SkShaper_primitive.cpp", + ] + } else { + sources = [ + "src/SkShaper_harfbuzz.cpp", + ] + deps += [ + "//third_party/harfbuzz", + "//third_party/icu", + ] + } + configs += [ "../../:skia_private" ] + + } +} + diff --git a/tools/shape/SkShaper.h b/modules/skshaper/include/SkShaper.h index 190a4d834e..190a4d834e 100644 --- a/tools/shape/SkShaper.h +++ b/modules/skshaper/include/SkShaper.h diff --git a/tools/shape/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp index 40414d9a79..40414d9a79 100644 --- a/tools/shape/SkShaper_harfbuzz.cpp +++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp diff --git a/tools/shape/SkShaper_primitive.cpp b/modules/skshaper/src/SkShaper_primitive.cpp index 06a8bec41c..06a8bec41c 100644 --- a/tools/shape/SkShaper_primitive.cpp +++ b/modules/skshaper/src/SkShaper_primitive.cpp diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn index 9ac98350a2..851d3fb5ac 100644 --- a/third_party/harfbuzz/BUILD.gn +++ b/third_party/harfbuzz/BUILD.gn @@ -61,5 +61,4 @@ third_party("harfbuzz") { sources += [ "../externals/harfbuzz/src/hb-coretext.cc" ] defines += [ "HAVE_CORETEXT" ] } - testonly = true } diff --git a/tools/shape/using_skia_and_harfbuzz.cpp b/tools/using_skia_and_harfbuzz.cpp index 5a74866794..5a74866794 100644 --- a/tools/shape/using_skia_and_harfbuzz.cpp +++ b/tools/using_skia_and_harfbuzz.cpp |