summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2016-03-25 09:57:11 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 16:58:34 +0000
commitfc09b679eaa615029a0288fc202c7886aa49e278 (patch)
treeac61f60142ee374100b41c81a37052abbc631acb /content/shell
parent9be8ca7b77549c46f9a51e991d25e1a509664fd5 (diff)
downloadchromium_src-fc09b679eaa615029a0288fc202c7886aa49e278.zip
chromium_src-fc09b679eaa615029a0288fc202c7886aa49e278.tar.gz
chromium_src-fc09b679eaa615029a0288fc202c7886aa49e278.tar.bz2
Revert of Content "gn check" work. (patchset #10 id:180001 of https://codereview.chromium.org/1828483002/ )
Reason for revert: Broke https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/19740/steps/compile/logs/stdio Original issue's description: > 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) > > Committed: https://crrev.com/f510be61306f5e4986eceb1f8686bfcc934cd400 > Cr-Commit-Position: refs/heads/master@{#383208} TBR=jam@chromium.org,jschuh@chromium.org,dcheng@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/1836533002 Cr-Commit-Position: refs/heads/master@{#383289}
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/BUILD.gn14
1 files changed, 2 insertions, 12 deletions
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 865931d..6ce50f8 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -221,14 +221,12 @@ static_library("content_shell_lib") {
"//content/app/strings",
"//content/gpu",
"//content/test:layouttest_support",
- "//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:mocks",
"//gin",
"//gpu",
"//ipc",
"//media",
- "//media/mojo/services:application_factory",
"//net",
"//net:net_resources",
"//skia",
@@ -257,7 +255,6 @@ static_library("content_shell_lib") {
"//content/ppapi_plugin",
"//ppapi:blink_deprecated_test_plugin",
"//ppapi:blink_test_plugin",
- "//ppapi/shared_impl",
]
}
if (mojo_media_host == "browser") {
@@ -273,10 +270,7 @@ static_library("content_shell_lib") {
}
if (is_linux) {
- deps += [
- "//build/linux:fontconfig",
- "//ui/gfx:test_support",
- ]
+ deps += [ "//build/linux:fontconfig" ]
}
if (use_x11) {
@@ -295,10 +289,7 @@ static_library("content_shell_lib") {
}
if (is_posix && !is_mac) {
- deps += [
- "//components/crash/content/app",
- "//components/crash/content/browser",
- ]
+ deps += [ "//components/crash/content/browser" ]
}
if (use_aura) {
@@ -317,7 +308,6 @@ static_library("content_shell_lib") {
"//ui/views",
"//ui/views:test_support",
"//ui/views/controls/webview",
- "//ui/wm:test_support",
]
} else {
sources += [ "browser/shell_aura.cc" ]