AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename sg tests and samples targets to fix Visual Studio name conflict

Browse Source 
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>
This commit is contained in:
Brian Osman 2018-06-01 10:40:17 -04:00 committed by Skia Commit-Bot
parent 222c9cfd1b
commit ba2f82986f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -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",
]

4
modules/sksg/BUILD.gn
View File

@ -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