diff options
| author | brettw <brettw@chromium.org> | 2016-03-22 10:09:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 17:11:16 +0000 |
| commit | 6334088eca79889051fd0abb44033d80d5d24c7d (patch) | |
| tree | d919def1dc83bbc46ecaa71b30def6171e8b67eb | |
| parent | d128879928dd4a8d4ea1d8ec7f2b8d718274be66 (diff) | |
| download | chromium_src-6334088eca79889051fd0abb44033d80d5d24c7d.zip chromium_src-6334088eca79889051fd0abb44033d80d5d24c7d.tar.gz chromium_src-6334088eca79889051fd0abb44033d80d5d24c7d.tar.bz2 | |
Make most of content/common pass gn check
This fixes all but one bug in content/common. That bug is filed separately as:
BUG=596736
Review URL: https://codereview.chromium.org/1817323002
Cr-Commit-Position: refs/heads/master@{#382591}
| -rw-r--r-- | content/common/BUILD.gn | 5 | ||||
| -rw-r--r-- | content/content_common.gypi | 1 | ||||
| -rw-r--r-- | sandbox/linux/BUILD.gn | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 783c4ad..e6f54e8 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -148,8 +148,11 @@ source_set("common") { ] deps = [ "//base", + "//base/third_party/dynamic_annotations", "//build/util:webkit_version", "//cc", + "//cc/blink", + "//cc/surfaces", "//components/mus/public/interfaces", "//components/tracing", "//components/tracing:startup_tracing", @@ -157,6 +160,7 @@ source_set("common") { # TODO: the dependency on gl_in_process_context should be decoupled from # content and moved to android_webview. See crbug.com/365797. + "//gpu", "//gpu/blink", "//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/client:gles2_c_lib", @@ -175,6 +179,7 @@ source_set("common") { "//mojo/common:common_base", "//mojo/converters/network", "//mojo/edk/system", + "//mojo/shell", "//mojo/shell/public/cpp", "//mojo/shell/public/interfaces", "//mojo/shell/runner/common", diff --git a/content/content_common.gypi b/content/content_common.gypi index d630b59..f8307e7 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -371,7 +371,6 @@ 'common/gpu/ca_layer_tree_mac.mm', 'common/gpu/child_window_surface_win.cc', 'common/gpu/child_window_surface_win.h', - 'common/gpu/gpu_host_messages.h', 'common/gpu/gpu_channel.cc', 'common/gpu/gpu_channel.h', 'common/gpu/gpu_channel_manager.cc', diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn index b7d3bfe..e08f42b 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn @@ -251,9 +251,11 @@ component("seccomp_bpf") { ] defines = [ "SANDBOX_IMPLEMENTATION" ] + public_deps = [ + ":sandbox_services_headers", + ] deps = [ ":sandbox_services", - ":sandbox_services_headers", "//base", ] @@ -360,6 +362,7 @@ component("sandbox_services") { defines = [ "SANDBOX_IMPLEMENTATION" ] + public_deps = [] deps = [ "//base", ] @@ -374,7 +377,7 @@ component("sandbox_services") { "services/namespace_utils.h", ] - deps += [ ":sandbox_services_headers" ] + public_deps += [ ":sandbox_services_headers" ] } if (is_nacl_nonsfi) { |