summaryrefslogtreecommitdiffstats
path: root/gpu/config
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-04-06 12:54:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-06 20:04:52 +0000
commitb3c7880dc9e66ff449b23e2273b4f20abecba442 (patch)
tree924b5677b9c0e1fbaa7387d1c9d34a68c0c957af /gpu/config
parent318e9c81d83a6862634b87b28e91fa1d4c4f8726 (diff)
downloadchromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.zip
chromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.tar.gz
chromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.tar.bz2
Work on Windows GN component build.
This makes ppapi_shared link. This required many changes to gpu to match the structure of GYP in both component and non-component modes. BUG=470212 CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1053203003 Cr-Commit-Position: refs/heads/master@{#323937}
Diffstat (limited to 'gpu/config')
-rw-r--r--gpu/config/BUILD.gn18
1 files changed, 16 insertions, 2 deletions
diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn
index f949358..add90ec 100644
--- a/gpu/config/BUILD.gn
+++ b/gpu/config/BUILD.gn
@@ -9,7 +9,21 @@ declare_args() {
use_libpci = true
}
-source_set("config") {
+group("config") {
+ if (is_component_build) {
+ public_deps = [
+ "//gpu",
+ ]
+ } else {
+ public_deps = [
+ ":config_sources",
+ ]
+ }
+}
+
+source_set("config_sources") {
+ visibility = [ "//gpu/*" ]
+
sources = [
"dx_diag_node.cc",
"dx_diag_node.h",
@@ -52,7 +66,7 @@ source_set("config") {
deps = [
"//base",
- "//gpu/command_buffer/service",
+ "//gpu/command_buffer/service:service_sources",
"//third_party/re2",
"//ui/gl",
]