aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2018-06-01 19:20:00 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-01 19:20:07 +0000
commitccb87523a25a9536d7ed8c7f424dd731732fa3b0 (patch)
tree2734bdfd49e681e36f2366cec5c70bde7a25188d
parentd494f6e3d68269d1a60e864561aa66a7b125be1a (diff)
Revert "Rename sg tests and samples targets to fix Visual Studio name conflict"
This reverts commit ba2f82986f63812d7b5ca529771d1c3962343c55. Reason for revert: This is going to be hard to maintain long-term. I've fixed the python script to handle this case: https://skia-review.googlesource.com/c/skia/+/131580 Original change's description: > 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> TBR=jvanverth@google.com,brianosman@google.com,fmalita@chromium.org,fmalita@google.com Change-Id: I25553fdcfd063c920635fe1bd71553b578d0b0c8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/131600 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
-rw-r--r--BUILD.gn4
-rw-r--r--modules/sksg/BUILD.gn4
2 files changed, 4 insertions, 4 deletions
diff --git a/BUILD.gn b/BUILD.gn
index f26d4b946e..5fa81c0f7e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1382,7 +1382,7 @@ if (skia_enable_tools) {
":flags",
":skia",
":tool_utils",
- "modules/sksg:sg_tests",
+ "modules/sksg:tests",
"//third_party/libpng",
"//third_party/zlib",
]
@@ -1524,7 +1524,7 @@ if (skia_enable_tools) {
":tool_utils",
":views",
":xml",
- "modules/sksg:sg_samples",
+ "modules/sksg:samples",
"modules/skshaper",
]
diff --git a/modules/sksg/BUILD.gn b/modules/sksg/BUILD.gn
index b4c74321cd..5fb45bcabf 100644
--- a/modules/sksg/BUILD.gn
+++ b/modules/sksg/BUILD.gn
@@ -50,7 +50,7 @@ source_set("sksg") {
}
}
-source_set("sg_tests") {
+source_set("tests") {
if (skia_enable_sksg) {
testonly = true
@@ -69,7 +69,7 @@ source_set("sg_tests") {
}
}
-source_set("sg_samples") {
+source_set("samples") {
if (skia_enable_sksg && target_cpu != "wasm") { # TODO: clean up wasm test
testonly = true