summaryrefslogtreecommitdiffstats
path: root/gpu/config
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-04-06 15:35:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-06 22:36:31 +0000
commit542f7537cf6f2d0a01be2893a859aaf629527fdd (patch)
treeec89299e1d78365be50c921e94696542ba8c3772 /gpu/config
parenta3084d7ed40ed48ff0da9d6ba5048debe8af5e82 (diff)
downloadchromium_src-542f7537cf6f2d0a01be2893a859aaf629527fdd.zip
chromium_src-542f7537cf6f2d0a01be2893a859aaf629527fdd.tar.gz
chromium_src-542f7537cf6f2d0a01be2893a859aaf629527fdd.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 Reland of https://codereview.chromium.org/1053203003/ Review URL: https://codereview.chromium.org/1061953002 Cr-Commit-Position: refs/heads/master@{#323966}
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",
]