Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2058)

Unified Diff: content/shell/BUILD.gn

Issue 419913003: Make content_shell link in the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android spelling Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | media/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index a6f177ef0c2ed1dad53efe2cb2a22573f0719e65..557abe3716eabcaf369837a02019f3624cd4ff17 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -146,6 +146,8 @@ static_library("content_shell_lib") {
"renderer/test_runner/event_sender.h",
"renderer/test_runner/gamepad_controller.cc",
"renderer/test_runner/gamepad_controller.h",
+ "renderer/test_runner/mock_color_chooser.cc",
+ "renderer/test_runner/mock_color_chooser.h",
"renderer/test_runner/mock_constraints.cc",
"renderer/test_runner/mock_constraints.h",
"renderer/test_runner/mock_grammar_check.cc",
@@ -201,6 +203,7 @@ static_library("content_shell_lib") {
"//cc",
"//components/breakpad/app",
"//content:resources",
+ "//content/app:both",
"//content/gpu",
"//content/ppapi_plugin",
"//content/public/browser",
@@ -218,6 +221,7 @@ static_library("content_shell_lib") {
"//skia",
"//third_party/icu",
"//third_party/WebKit/public:blink",
+ "//third_party/WebKit/public:test_support",
"//ui/base",
"//ui/events:events_base",
"//ui/gfx",
@@ -228,9 +232,7 @@ static_library("content_shell_lib") {
"//v8",
"//webkit:resources",
"//webkit/browser:storage",
- #'content.gyp:content_app_both', TODO(GYP)
#'copy_test_netscape_plugin', TODO(GYP)
- #'../third_party/WebKit/public/blink.gyp:blink_test_support', TODO(GYP)
]
if (is_win) {
@@ -416,8 +418,6 @@ repack("pak") {
}
}
-if (false) { # TODO(GYP) enable once this links.
-
executable("content_shell") {
# TODO(GYP) mac resource bundle stuff for this target.
# TODO(GYP) Windows content shell settings:
@@ -456,9 +456,3 @@ executable("content_shell") {
]
}
}
-
-} else {
- # Content shell not ready, make a dummpy to make dependency management easier.
- group("content_shell") {
- }
-}
« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698