Index: headless/BUILD.gn |
diff --git a/headless/BUILD.gn b/headless/BUILD.gn |
index 2d83fadcc35e60c8e30cd7bdae08ed9e04e70247..1b2ccc43db40f63f8e6a3de66fd39b7a13390ad4 100644 |
--- a/headless/BUILD.gn |
+++ b/headless/BUILD.gn |
@@ -289,12 +289,10 @@ static_library("headless_lib") { |
":gen_devtools_client_api", |
":version_header", |
"//base", |
+ "//components/crash/content/app:app", |
"//components/crash/content/browser", |
"//components/security_state/content", |
"//components/security_state/core", |
- "//content/public/app:both", |
- "//content/public/browser", |
Sami
2017/03/22 19:46:25
Why remove these? Only content/public/child seems
dvallet
2017/03/27 05:59:50
The issue is that chrome in windows has restrictio
|
- "//content/public/child:child", |
"//content/public/common", |
"//content/public/common:service_names", |
"//net", |
@@ -356,6 +354,8 @@ test("headless_unittests") { |
"//testing/gmock", |
"//testing/gtest", |
] |
+ |
+ configs += [ ":headless_implementation" ] |
} |
mojom("embedder_mojo_for_testing") { |
@@ -431,6 +431,45 @@ test("headless_browsertests") { |
"//testing/gmock", |
"//testing/gtest", |
] |
+ |
+ configs += [ ":headless_implementation" ] |
Sami
2017/03/22 19:46:25
I don't think this should be on the testing target
dvallet
2017/03/27 05:59:50
Done
|
+} |
+ |
+static_library("headless_shell_main_lib") { |
+ sources = [ |
+ "app/headless_shell.cc", |
+ "app/headless_shell.h", |
+ "app/headless_shell_switches.cc", |
+ "app/headless_shell_switches.h", |
+ "app/shell_navigation_request.cc", |
+ "app/shell_navigation_request.h", |
+ "public/headless_shell.h", |
+ ] |
+ |
+ deps = [ |
+ ":headless_lib", |
+ "//content/public/browser", |
+ "//content/public/common", |
+ ] |
+ |
+ configs += [ ":headless_implementation" ] |
+} |
+ |
+static_library("headless_shell_child_lib") { |
+ sources = [ |
+ "app/headless_shell.cc", |
+ "app/headless_shell.h", |
+ "app/headless_shell_switches.cc", |
+ "app/headless_shell_switches.h", |
+ "app/shell_navigation_request.cc", |
+ "app/shell_navigation_request.h", |
+ "public/headless_shell.h", |
+ ] |
+ |
+ deps = [ |
+ ":headless_lib", |
+ "//content/public/child:child", |
+ ] |
} |
static_library("headless_shell_lib") { |
@@ -445,9 +484,17 @@ static_library("headless_shell_lib") { |
] |
deps = [ |
- "//headless:headless_lib", |
+ "//headless:headless_shell_child_lib", |
+ "//headless:headless_shell_main_lib", |
] |
+ if (is_win) { |
+ deps += [ |
+ "//content:sandbox_helper_win", |
+ "//sandbox", |
+ ] |
+ } |
+ |
configs += [ ":headless_implementation" ] |
} |
@@ -457,13 +504,13 @@ executable("headless_shell") { |
] |
deps = [ |
- "//headless:headless_shell_lib", |
+ ":headless_shell_lib", |
+ "//content/public/app:both", |
] |
if (is_win) { |
deps += [ |
"//build/win:default_exe_manifest", |
- "//content:sandbox_helper_win", |
"//sandbox", |
] |
} |
@@ -486,6 +533,16 @@ executable("headless_example") { |
] |
deps = [ |
+ "//content/public/app:both", |
"//headless:headless_shell_lib", |
] |
+ |
+ if (is_win) { |
+ deps += [ |
+ "//content:sandbox_helper_win", |
+ "//sandbox", |
+ ] |
+ } |
+ |
+ configs += [ ":headless_implementation" ] |
Sami
2017/03/22 19:46:25
Also this seems unnecessary -- the example isn't i
dvallet
2017/03/27 05:59:50
Done.
|
} |