diff options
| author |  Brian Osman <brianosman@google.com> | 2018-06-01 10:40:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 15:12:26 +0000 |
| commit | ba2f82986f63812d7b5ca529771d1c3962343c55 (patch) | |
| tree | fe90908dff535ecbd3568eeac3d1399a4f8a7282 | |
| parent | 222c9cfd1b3f50d21d4a1f93b0b52dd4973fe1b5 (diff) | |
Rename sg tests and samples targets to fix Visual Studio name conflict
GN was emitting projects for the SG versions of tests and samples, which
conflicted with the top-level versions of those. This made the normal GN
VS IDE files confusing, and the merged ones totally broken.
Change-Id: Ifd048258d4358ed2852d5263b16278c5b8ebd9c4
Reviewed-on: https://skia-review.googlesource.com/131391
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | modules/sksg/BUILD.gn | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1382,7 +1382,7 @@ if (skia_enable_tools) { ":flags", ":skia", ":tool_utils", - "modules/sksg:tests", + "modules/sksg:sg_tests", "//third_party/libpng", "//third_party/zlib", ] @@ -1524,7 +1524,7 @@ if (skia_enable_tools) { ":tool_utils", ":views", ":xml", - "modules/sksg:samples", + "modules/sksg:sg_samples", "modules/skshaper", ] diff --git a/modules/sksg/BUILD.gn b/modules/sksg/BUILD.gn index 5fb45bcabf..b4c74321cd 100644 --- a/modules/sksg/BUILD.gn +++ b/modules/sksg/BUILD.gn @@ -50,7 +50,7 @@ source_set("sksg") { } } -source_set("tests") { +source_set("sg_tests") { if (skia_enable_sksg) { testonly = true @@ -69,7 +69,7 @@ source_set("tests") { } } -source_set("samples") { +source_set("sg_samples") { if (skia_enable_sksg && target_cpu != "wasm") { # TODO: clean up wasm test testonly = true |