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>
diff --git a/BUILD.gn b/BUILD.gn
index f26d4b9..5fa81c0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1382,7 +1382,7 @@
":flags",
":skia",
":tool_utils",
- "modules/sksg:sg_tests",
+ "modules/sksg:tests",
"//third_party/libpng",
"//third_party/zlib",
]
@@ -1524,7 +1524,7 @@
":tool_utils",
":views",
":xml",
- "modules/sksg:sg_samples",
+ "modules/sksg:samples",
"modules/skshaper",
]