diff options
| author | brettw <brettw@chromium.org> | 2016-03-24 17:41:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 00:42:55 +0000 |
| commit | f510be61306f5e4986eceb1f8686bfcc934cd400 (patch) | |
| tree | 934d72ba4133b7c5d8dff2b0cf8f6400750851df /content/public | |
| parent | bafc20f876b6a70a5bee326eb388f6a057143112 (diff) | |
| download | chromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.zip chromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.tar.gz chromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.tar.bz2 | |
Content "gn check" work.
Make content/gpu and content/plugin pass GN check.
Makes most of content/shell and content/test pass check. These are not all enabled yet pending a few remaining issues that are more difficult to solve.
The private content targets now allow content/test to include headers from them for non-component builds. Checking is disabled for content/test in component builds as described in the comment at the top of //content/BUILD.gn
Renames the ui/events/ipc according to GN style
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
TBR=jschuh (IPC build tweak)
Review URL: https://codereview.chromium.org/1828483002
Cr-Commit-Position: refs/heads/master@{#383208}
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/public/gpu/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/public/plugin/BUILD.gn | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn index 643cb8f..4d6d84c 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn @@ -40,7 +40,7 @@ source_set("browser_sources") { ] deps = [ "//cc", - "//content/browser", + "//content/browser", # Must not be public_deps! "//content/public/common:common_sources", "//gpu", "//media", diff --git a/content/public/gpu/BUILD.gn b/content/public/gpu/BUILD.gn index 3bca008..708d8b6 100644 --- a/content/public/gpu/BUILD.gn +++ b/content/public/gpu/BUILD.gn @@ -28,4 +28,6 @@ source_set("gpu_sources") { "//content/gpu:gpu_sources", "//content/public/common:common_sources", ] + + allow_circular_includes_from = [ "//content/gpu:gpu_sources" ] } diff --git a/content/public/plugin/BUILD.gn b/content/public/plugin/BUILD.gn index e4c4d36..1a0bfd9 100644 --- a/content/public/plugin/BUILD.gn +++ b/content/public/plugin/BUILD.gn @@ -24,7 +24,13 @@ source_set("plugin_sources") { deps = [ "//base", - "//content/plugin", + "//content/plugin", # Must not be a public dep. "//content/public/common:common_sources", ] + + allow_circular_includes_from = [ + # This target is a pair with content/plugin. They always go together and + # include headers from each other. + "//content/plugin", + ] } |